From 93360ae0e50d8c433dc979734b645288ff000ae7 Mon Sep 17 00:00:00 2001 From: Honghua Zhu Date: Mon, 1 Jan 2024 08:28:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BB=8E=20org.lealone=20?= =?UTF-8?q?=E5=8F=98=E6=88=90=20com.lealone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lealone-aose/pom.xml | 4 +- .../lealone/storage/aose/AOStorage.java | 24 +- .../storage/aose/AOStorageBuilder.java | 12 +- .../lealone/storage/aose/AOStorageEngine.java | 14 +- .../storage/aose/btree/BTreeCursor.java | 10 +- .../lealone/storage/aose/btree/BTreeGC.java | 14 +- .../lealone/storage/aose/btree/BTreeMap.java | 66 ++-- .../storage/aose/btree/BTreeStorage.java | 42 +-- .../storage/aose/btree/chunk/Chunk.java | 16 +- .../aose/btree/chunk/ChunkCompactor.java | 10 +- .../aose/btree/chunk/ChunkManager.java | 16 +- .../storage/aose/btree/page/ColumnPage.java | 10 +- .../storage/aose/btree/page/LeafPage.java | 12 +- .../storage/aose/btree/page/LocalPage.java | 8 +- .../storage/aose/btree/page/NodePage.java | 14 +- .../lealone/storage/aose/btree/page/Page.java | 20 +- .../storage/aose/btree/page/PageInfo.java | 2 +- .../aose/btree/page/PageOperations.java | 22 +- .../aose/btree/page/PageReference.java | 22 +- .../aose/btree/page/PageStorageMode.java | 2 +- .../storage/aose/btree/page/PageUtils.java | 2 +- .../aose/btree/page/PrettyPagePrinter.java | 2 +- .../storage/aose/lob/LobStreamMap.java | 8 +- .../storage/aose/lob/LobStreamStorage.java | 28 +- .../com.lealone.storage.StorageEngine | 1 + .../org.lealone.storage.StorageEngine | 1 - lealone-aote/pom.xml | 4 +- .../transaction/aote/AOTransaction.java | 52 +-- .../transaction/aote/AOTransactionEngine.java | 30 +- .../transaction/aote/AOTransactionMap.java | 42 +-- .../transaction/aote/CheckpointService.java | 28 +- .../transaction/aote/TransactionalValue.java | 20 +- .../aote/TransactionalValueType.java | 8 +- .../transaction/aote/lock/InsertRowLock.java | 6 +- .../transaction/aote/lock/RowLock.java | 12 +- .../transaction/aote/lock/RowLockOwner.java | 6 +- .../aote/log/InstantLogSyncService.java | 4 +- .../transaction/aote/log/LogSyncService.java | 20 +- .../aote/log/NoLogSyncService.java | 4 +- .../aote/log/PeriodicLogSyncService.java | 8 +- .../lealone/transaction/aote/log/RedoLog.java | 26 +- .../transaction/aote/log/RedoLogChunk.java | 30 +- .../transaction/aote/log/RedoLogRecord.java | 14 +- .../lealone/transaction/aote/log/UndoLog.java | 12 +- .../transaction/aote/log/UndoLogRecord.java | 14 +- .../aote/tm/ConcurrentTransactionManager.java | 6 +- .../tm/SingleThreadTransactionManager.java | 8 +- .../aote/tm/TransactionManager.java | 6 +- .../com.lealone.transaction.TransactionEngine | 1 + .../org.lealone.transaction.TransactionEngine | 1 - lealone-client/pom.xml | 6 +- .../lealone/client/ClientScheduler.java | 28 +- .../lealone/client/ClientServiceProxy.java | 8 +- .../lealone/client/LealoneClient.java | 24 +- .../command/ClientPreparedSQLCommand.java | 56 +-- .../client/command/ClientSQLCommand.java | 38 +- .../lealone/client/jdbc/JdbcArray.java | 8 +- .../client/jdbc/JdbcAsyncCallback.java | 4 +- .../client/jdbc/JdbcBatchUpdateException.java | 2 +- .../lealone/client/jdbc/JdbcBlob.java | 12 +- .../client/jdbc/JdbcCallableStatement.java | 16 +- .../lealone/client/jdbc/JdbcClob.java | 14 +- .../lealone/client/jdbc/JdbcConnection.java | 38 +- .../lealone/client/jdbc/JdbcDataSource.java | 8 +- .../client/jdbc/JdbcDataSourceFactory.java | 14 +- .../client/jdbc/JdbcDatabaseMetaData.java | 12 +- .../lealone/client/jdbc/JdbcDriver.java | 12 +- .../client/jdbc/JdbcParameterMetaData.java | 16 +- .../client/jdbc/JdbcPreparedStatement.java | 60 ++-- .../lealone/client/jdbc/JdbcResultSet.java | 58 +-- .../client/jdbc/JdbcResultSetMetaData.java | 12 +- .../lealone/client/jdbc/JdbcSavepoint.java | 14 +- .../lealone/client/jdbc/JdbcStatement.java | 26 +- .../lealone/client/jdbc/JdbcWrapper.java | 8 +- .../lealone/client/result/ClientResult.java | 28 +- .../client/result/ClientResultColumn.java | 4 +- .../RowCountDeterminedClientResult.java | 10 +- .../RowCountUndeterminedClientResult.java | 10 +- .../lealone/client/result/UpdatableRow.java | 22 +- .../client/session/AutoReconnectSession.java | 8 +- .../lealone/client/session/ClientSession.java | 66 ++-- .../client/session/ClientSessionFactory.java | 46 +-- .../com.lealone.db.session.SessionFactory | 1 + .../META-INF/services/java.sql.Driver | 2 +- .../org.lealone.db.session.SessionFactory | 1 - lealone-common/pom.xml | 2 +- .../common/compress/CompressDeflate.java | 6 +- .../lealone/common/compress/CompressLZF.java | 2 +- .../lealone/common/compress/CompressNo.java | 2 +- .../lealone/common/compress/CompressTool.java | 12 +- .../lealone/common/compress/Compressor.java | 2 +- .../common/compress/LZFInputStream.java | 6 +- .../common/compress/LZFOutputStream.java | 4 +- .../common/exceptions/ConfigException.java | 2 +- .../common/exceptions/DbException.java | 17 +- .../common/exceptions/JdbcSQLException.java | 4 +- .../UnsupportedSchemaException.java | 4 +- .../lealone/common/logging/Logger.java | 2 +- .../lealone/common/logging/LoggerFactory.java | 8 +- .../common/logging/impl/ConsoleLogger.java | 6 +- .../logging/impl/ConsoleLoggerFactory.java | 4 +- .../common/logging/impl/Log4j2Logger.java | 7 +- .../logging/impl/Log4j2LoggerFactory.java | 4 +- .../lealone/common/security/AES.java | 2 +- .../lealone/common/security/BlockCipher.java | 2 +- .../common/security/CipherFactory.java | 6 +- .../common/security/EncryptionOptions.java | 2 +- .../lealone/common/security/Fog.java | 4 +- .../lealone/common/security/SHA256.java | 2 +- .../lealone/common/security/XTEA.java | 6 +- .../lealone/common/trace/DefaultTrace.java | 4 +- .../common/trace/DefaultTraceWriter.java | 14 +- .../lealone/common/trace/NoTrace.java | 2 +- .../lealone/common/trace/Trace.java | 8 +- .../lealone/common/trace/TraceModuleType.java | 2 +- .../lealone/common/trace/TraceObject.java | 8 +- .../lealone/common/trace/TraceObjectType.java | 4 +- .../lealone/common/trace/TraceSystem.java | 2 +- .../lealone/common/trace/TraceWriter.java | 2 +- .../common/trace/TraceWriterAdapter.java | 6 +- .../lealone/common/util/Awaiter.java | 4 +- .../lealone/common/util/BitField.java | 2 +- .../lealone/common/util/CamelCaseHelper.java | 2 +- .../common/util/CaseInsensitiveMap.java | 2 +- .../lealone/common/util/DataUtils.java | 4 +- .../lealone/common/util/DateTimeUtils.java | 16 +- .../lealone/common/util/ExpiringMap.java | 14 +- .../lealone/common/util/IOUtils.java | 10 +- .../lealone/common/util/JdbcUtils.java | 2 +- .../lealone/common/util/MapUtils.java | 2 +- .../lealone/common/util/MathUtils.java | 2 +- .../lealone/common/util/ScriptReader.java | 6 +- .../common/util/ShutdownHookUtils.java | 2 +- .../lealone/common/util/SmallLRUCache.java | 2 +- .../lealone/common/util/SortedProperties.java | 9 +- .../lealone/common/util/StatementBuilder.java | 2 +- .../lealone/common/util/StringUtils.java | 10 +- .../common/util/SystemPropertyUtils.java | 2 +- .../lealone/common/util/Task.java | 2 +- .../lealone/common/util/TempFileDeleter.java | 8 +- .../lealone/common/util/ThreadUtils.java | 2 +- .../lealone/common/util/Utils.java | 14 +- .../java/{org => com}/lealone/db/Command.java | 2 +- .../lealone/db/CommandParameter.java | 6 +- .../lealone/db/ConnectionInfo.java | 27 +- .../lealone/db/ConnectionSetting.java | 2 +- .../{org => com}/lealone/db/Constants.java | 12 +- .../{org => com}/lealone/db/DataBuffer.java | 75 ++-- .../lealone/db/DataBufferFactory.java | 2 +- .../{org => com}/lealone/db/DataHandler.java | 10 +- .../{org => com}/lealone/db/DbSetting.java | 2 +- .../lealone/db/LocalDataHandler.java | 20 +- .../lealone/db/ManualCloseable.java | 2 +- .../lealone/db/MemoryManager.java | 4 +- .../lealone/db/PluggableEngine.java | 2 +- .../java/{org => com}/lealone/db/Plugin.java | 2 +- .../{org => com}/lealone/db/PluginBase.java | 4 +- .../lealone/db/PluginManager.java | 6 +- .../java/{org => com}/lealone/db/RunMode.java | 6 +- .../lealone/db/SysProperties.java | 10 +- .../lealone/db/api/Aggregate.java | 4 +- .../lealone/db/api/DatabaseEventListener.java | 2 +- .../lealone/db/api/ErrorCode.java | 10 +- .../lealone/db/api/JavaObjectSerializer.java | 2 +- .../{org => com}/lealone/db/api/Trigger.java | 2 +- .../lealone/db/async/AsyncCallback.java | 10 +- .../lealone/db/async/AsyncHandler.java | 2 +- .../lealone/db/async/AsyncPeriodicTask.java | 4 +- .../lealone/db/async/AsyncResult.java | 2 +- .../lealone/db/async/AsyncTask.java | 2 +- .../lealone/db/async/AsyncTaskHandler.java | 2 +- .../db/async/ConcurrentAsyncCallback.java | 10 +- .../lealone/db/async/FailedFuture.java | 4 +- .../{org => com}/lealone/db/async/Future.java | 2 +- .../db/async/SingleThreadAsyncCallback.java | 10 +- .../lealone/db/async/SucceededFuture.java | 2 +- .../lealone/db/link/Linkable.java | 2 +- .../lealone/db/link/LinkableBase.java | 2 +- .../lealone/db/link/LinkableList.java | 2 +- .../lealone/db/result/Result.java | 6 +- .../lealone/db/result/SimpleResultSet.java | 12 +- .../lealone/db/result/SimpleRowSource.java | 2 +- .../db/scheduler/EmbeddedScheduler.java | 28 +- .../lealone/db/scheduler/Scheduler.java | 20 +- .../lealone/db/scheduler/SchedulerBase.java | 28 +- .../db/scheduler/SchedulerFactory.java | 4 +- .../db/scheduler/SchedulerFactoryBase.java | 16 +- .../db/scheduler/SchedulerListener.java | 8 +- .../lealone/db/scheduler/SchedulerLock.java | 2 +- .../lealone/db/scheduler/SchedulerThread.java | 4 +- .../lealone/db/session/DelegatedSession.java | 32 +- .../lealone/db/session/Session.java | 36 +- .../lealone/db/session/SessionBase.java | 32 +- .../lealone/db/session/SessionFactory.java | 8 +- .../db/session/SessionFactoryBase.java | 6 +- .../lealone/db/session/SessionSetting.java | 2 +- .../lealone/db/session/SessionStatus.java | 2 +- .../lealone/db/value/ArrayBase.java | 10 +- .../lealone/db/value/BlobBase.java | 12 +- .../lealone/db/value/ClobBase.java | 12 +- .../lealone/db/value/CompareMode.java | 4 +- .../lealone/db/value/CompareModeDefault.java | 8 +- .../lealone/db/value/CompareModeIcu4J.java | 8 +- .../lealone/db/value/DataType.java | 22 +- .../lealone/db/value/ReadonlyArray.java | 6 +- .../lealone/db/value/ReadonlyBlob.java | 6 +- .../lealone/db/value/ReadonlyClob.java | 6 +- .../{org => com}/lealone/db/value/Value.java | 20 +- .../lealone/db/value/ValueArray.java | 10 +- .../lealone/db/value/ValueBoolean.java | 6 +- .../lealone/db/value/ValueByte.java | 12 +- .../lealone/db/value/ValueBytes.java | 10 +- .../lealone/db/value/ValueDate.java | 18 +- .../lealone/db/value/ValueDecimal.java | 14 +- .../lealone/db/value/ValueDouble.java | 12 +- .../lealone/db/value/ValueEnum.java | 8 +- .../lealone/db/value/ValueFloat.java | 12 +- .../lealone/db/value/ValueInt.java | 14 +- .../lealone/db/value/ValueJavaObject.java | 6 +- .../lealone/db/value/ValueList.java | 8 +- .../lealone/db/value/ValueLob.java | 30 +- .../lealone/db/value/ValueLong.java | 14 +- .../lealone/db/value/ValueMap.java | 8 +- .../lealone/db/value/ValueNull.java | 8 +- .../lealone/db/value/ValueResultSet.java | 8 +- .../lealone/db/value/ValueSet.java | 8 +- .../lealone/db/value/ValueShort.java | 12 +- .../lealone/db/value/ValueString.java | 14 +- .../lealone/db/value/ValueStringFixed.java | 6 +- .../db/value/ValueStringIgnoreCase.java | 6 +- .../lealone/db/value/ValueTime.java | 18 +- .../lealone/db/value/ValueTimestamp.java | 16 +- .../lealone/db/value/ValueUuid.java | 16 +- .../lealone/net/NetInputStream.java | 4 +- .../{org => com}/lealone/net/NetNode.java | 4 +- .../lealone/net/NetOutputStream.java | 4 +- .../server/DelegatedProtocolServer.java | 4 +- .../lealone/server/ProtocolServer.java | 6 +- .../lealone/server/ProtocolServerBase.java | 8 +- .../lealone/server/ProtocolServerEngine.java | 4 +- .../server/ProtocolServerEngineBase.java | 6 +- .../lealone/server/protocol/AckPacket.java | 2 +- .../server/protocol/AckPacketHandler.java | 2 +- .../lealone/server/protocol/NoAckPacket.java | 2 +- .../lealone/server/protocol/Packet.java | 4 +- .../server/protocol/PacketDecoder.java | 4 +- .../server/protocol/PacketDecoders.java | 58 +-- .../lealone/server/protocol/PacketType.java | 2 +- .../lealone/server/protocol/QueryPacket.java | 6 +- .../batch/BatchStatementPreparedUpdate.java | 14 +- .../protocol/batch/BatchStatementUpdate.java | 12 +- .../batch/BatchStatementUpdateAck.java | 12 +- .../lealone/server/protocol/lob/LobRead.java | 12 +- .../server/protocol/lob/LobReadAck.java | 12 +- .../protocol/ps/PreparedStatementClose.java | 12 +- .../ps/PreparedStatementGetMetaData.java | 12 +- .../ps/PreparedStatementGetMetaDataAck.java | 14 +- .../protocol/ps/PreparedStatementPrepare.java | 12 +- .../ps/PreparedStatementPrepareAck.java | 12 +- .../PreparedStatementPrepareReadParams.java | 12 +- ...PreparedStatementPrepareReadParamsAck.java | 20 +- .../protocol/ps/PreparedStatementQuery.java | 14 +- .../protocol/ps/PreparedStatementUpdate.java | 14 +- .../protocol/result/ResultChangeId.java | 12 +- .../server/protocol/result/ResultClose.java | 12 +- .../protocol/result/ResultFetchRows.java | 12 +- .../protocol/result/ResultFetchRowsAck.java | 18 +- .../server/protocol/result/ResultReset.java | 12 +- .../session/SessionCancelStatement.java | 12 +- .../server/protocol/session/SessionClose.java | 12 +- .../server/protocol/session/SessionInit.java | 20 +- .../protocol/session/SessionInitAck.java | 16 +- .../session/SessionSetAutoCommit.java | 12 +- .../protocol/statement/StatementQuery.java | 12 +- .../protocol/statement/StatementQueryAck.java | 18 +- .../protocol/statement/StatementUpdate.java | 12 +- .../statement/StatementUpdateAck.java | 12 +- .../{org => com}/lealone/sql/IExpression.java | 6 +- .../java/{org => com}/lealone/sql/IQuery.java | 6 +- .../lealone/sql/ISelectUnion.java | 4 +- .../lealone/sql/ParsedSQLStatement.java | 2 +- .../lealone/sql/PreparedSQLStatement.java | 12 +- .../{org => com}/lealone/sql/SQLCommand.java | 10 +- .../{org => com}/lealone/sql/SQLEngine.java | 16 +- .../{org => com}/lealone/sql/SQLParser.java | 2 +- .../lealone/sql/SQLStatement.java | 2 +- .../lealone/storage/CursorParameters.java | 2 +- .../{org => com}/lealone/storage/Storage.java | 8 +- .../lealone/storage/StorageBase.java | 14 +- .../lealone/storage/StorageBuilder.java | 8 +- .../lealone/storage/StorageEngine.java | 14 +- .../lealone/storage/StorageEngineBase.java | 12 +- .../lealone/storage/StorageEventListener.java | 2 +- .../lealone/storage/StorageMap.java | 14 +- .../lealone/storage/StorageMapBase.java | 10 +- .../lealone/storage/StorageMapCursor.java | 4 +- .../lealone/storage/StorageSetting.java | 2 +- .../lealone/storage/fs/FilePath.java | 8 +- .../lealone/storage/fs/FileStorage.java | 24 +- .../storage/fs/FileStorageInputStream.java | 14 +- .../storage/fs/FileStorageOutputStream.java | 10 +- .../lealone/storage/fs/FileUtils.java | 2 +- .../lealone/storage/fs/impl/FileBase.java | 2 +- .../fs/impl/FileChannelInputStream.java | 2 +- .../fs/impl/FileChannelOutputStream.java | 4 +- .../storage/fs/impl/FilePathWrapper.java | 4 +- .../storage/fs/impl/disk/FileDisk.java | 6 +- .../storage/fs/impl/disk/FilePathDisk.java | 14 +- .../storage/fs/impl/encrypt/FileEncrypt.java | 22 +- .../fs/impl/encrypt/FilePathEncrypt.java | 14 +- .../lealone/storage/fs/impl/nio/FileNio.java | 4 +- .../storage/fs/impl/nio/FilePathNio.java | 4 +- .../lealone/storage/lob/LobLocalStorage.java | 8 +- .../lealone/storage/lob/LobStorage.java | 8 +- .../lealone/storage/page/IPage.java | 2 +- .../lealone/storage/page/PageOperation.java | 6 +- .../lealone/storage/type/BigIntegerType.java | 6 +- .../lealone/storage/type/CharacterType.java | 4 +- .../lealone/storage/type/ObjectArrayType.java | 8 +- .../lealone/storage/type/ObjectDataType.java | 34 +- .../storage/type/SerializedObjectType.java | 6 +- .../lealone/storage/type/StorageDataType.java | 10 +- .../storage/type/StorageDataTypeBase.java | 8 +- .../transaction/ITransactionalValue.java | 2 +- .../transaction/PendingTransaction.java | 6 +- .../lealone/transaction/Transaction.java | 14 +- .../transaction/TransactionEngine.java | 12 +- .../transaction/TransactionEngineBase.java | 6 +- .../lealone/transaction/TransactionMap.java | 10 +- .../transaction/TransactionMapCursor.java | 4 +- .../common/resources/_messages_en.prop | 0 .../common/resources/_messages_zh.prop | 0 .../common/resources/version.properties | 0 lealone-db/pom.xml | 4 +- .../java/{org => com}/lealone/db/Comment.java | 6 +- .../{org => com}/lealone/db/Database.java | 112 +++--- .../{org => com}/lealone/db/DbObject.java | 6 +- .../{org => com}/lealone/db/DbObjectBase.java | 6 +- .../{org => com}/lealone/db/DbObjectType.java | 2 +- .../{org => com}/lealone/db/DbSettings.java | 14 +- .../lealone/db/LealoneDatabase.java | 18 +- .../{org => com}/lealone/db/MetaRecord.java | 22 +- .../java/{org => com}/lealone/db/Mode.java | 4 +- .../{org => com}/lealone/db/PluginObject.java | 6 +- .../{org => com}/lealone/db/Procedure.java | 4 +- .../lealone/db/TransactionalDbObjects.java | 10 +- .../lealone/db/auth/PasswordHash.java | 14 +- .../{org => com}/lealone/db/auth/Right.java | 24 +- .../lealone/db/auth/RightOwner.java | 10 +- .../{org => com}/lealone/db/auth/Role.java | 10 +- .../{org => com}/lealone/db/auth/User.java | 40 +-- .../db/auth/scram/ScramPasswordData.java | 2 +- .../db/auth/scram/ScramPasswordHash.java | 6 +- .../lealone/db/constraint/Constraint.java | 22 +- .../db/constraint/ConstraintCheck.java | 30 +- .../db/constraint/ConstraintReferential.java | 42 +-- .../db/constraint/ConstraintUnique.java | 22 +- .../{org => com}/lealone/db/index/Cursor.java | 6 +- .../{org => com}/lealone/db/index/Index.java | 26 +- .../lealone/db/index/IndexBase.java | 36 +- .../lealone/db/index/IndexColumn.java | 8 +- .../lealone/db/index/IndexConditionType.java | 2 +- .../lealone/db/index/IndexRebuilder.java | 18 +- .../lealone/db/index/IndexType.java | 2 +- .../lealone/db/index/MetaIndex.java | 14 +- .../lealone/db/index/RangeIndex.java | 20 +- .../lealone/db/index/ViewIndex.java | 44 +-- .../lealone/db/index/hash/HashIndex.java | 26 +- .../db/index/hash/NonUniqueHashIndex.java | 26 +- .../db/index/hash/UniqueHashIndex.java | 22 +- .../lealone/db/index/standard/IndexKey.java | 4 +- .../db/index/standard/IndexKeyType.java | 12 +- .../index/standard/StandardDelegateIndex.java | 28 +- .../db/index/standard/StandardIndex.java | 12 +- .../index/standard/StandardPrimaryIndex.java | 60 ++-- .../standard/StandardSecondaryIndex.java | 46 +-- .../db/index/standard/UniqueKeyType.java | 6 +- .../db/index/standard/ValueDataType.java | 18 +- .../db/index/standard/VersionedValue.java | 4 +- .../db/index/standard/VersionedValueType.java | 16 +- .../lealone/db/lock/DbObjectLock.java | 12 +- .../lealone/db/result/DelegatedResult.java | 4 +- .../lealone/db/result/LocalResult.java | 18 +- .../lealone/db/result/ResultExternal.java | 4 +- .../lealone/db/result/ResultTarget.java | 4 +- .../lealone/db/result/ResultTempTable.java | 30 +- .../{org => com}/lealone/db/result/Row.java | 10 +- .../lealone/db/result/RowBase.java | 2 +- .../lealone/db/result/SearchRow.java | 4 +- .../lealone/db/result/SimpleRow.java | 8 +- .../lealone/db/result/SimpleRowValue.java | 6 +- .../lealone/db/result/SortOrder.java | 22 +- .../lealone/db/schema/Constant.java | 6 +- .../lealone/db/schema/FunctionAlias.java | 32 +- .../lealone/db/schema/Schema.java | 48 +-- .../lealone/db/schema/SchemaObject.java | 4 +- .../lealone/db/schema/SchemaObjectBase.java | 4 +- .../lealone/db/schema/Sequence.java | 16 +- .../lealone/db/schema/TriggerObject.java | 32 +- .../lealone/db/schema/UserAggregate.java | 10 +- .../lealone/db/schema/UserDataType.java | 6 +- .../db/service/JavaServiceExecutor.java | 16 +- .../service/JavaServiceExecutorFactory.java | 2 +- .../lealone/db/service/JsonArrayGetter.java | 8 +- .../lealone/db/service/Service.java | 28 +- .../lealone/db/service/ServiceExecutor.java | 12 +- .../db/service/ServiceExecutorBase.java | 8 +- .../db/service/ServiceExecutorFactory.java | 4 +- .../service/ServiceExecutorFactoryBase.java | 6 +- .../lealone/db/service/ServiceMethod.java | 4 +- .../lealone/db/service/ServiceSetting.java | 2 +- .../lealone/db/session/ServerSession.java | 102 +++--- .../db/session/ServerSessionFactory.java | 32 +- .../lealone/db/stat/QueryStatisticsData.java | 2 +- .../{org => com}/lealone/db/table/Column.java | 62 ++-- .../lealone/db/table/CreateTableData.java | 8 +- .../lealone/db/table/DummyTable.java | 8 +- .../lealone/db/table/InfoMetaTable.java | 100 +++--- .../lealone/db/table/MetaTable.java | 28 +- .../lealone/db/table/PerfMetaTable.java | 16 +- .../lealone/db/table/RangeTable.java | 22 +- .../lealone/db/table/StandardTable.java | 80 ++--- .../{org => com}/lealone/db/table/Table.java | 58 +-- .../lealone/db/table/TableAlterHistory.java | 8 +- .../db/table/TableAlterHistoryRecord.java | 10 +- .../lealone/db/table/TableAnalyzer.java | 22 +- .../lealone/db/table/TableCodeGenerator.java | 6 +- .../db/table/TableCodeGeneratorBase.java | 6 +- .../lealone/db/table/TableDataHandler.java | 20 +- .../lealone/db/table/TableFactory.java | 2 +- .../lealone/db/table/TableSetting.java | 2 +- .../lealone/db/table/TableType.java | 2 +- .../lealone/db/table/TableView.java | 46 +-- .../{org => com}/lealone/db/util/Csv.java | 20 +- .../lealone/db/util/HashBase.java | 2 +- .../lealone/db/util/IntArray.java | 6 +- .../lealone/db/util/IntIntHashMap.java | 4 +- .../lealone/db/util/SourceCompiler.java | 13 +- .../lealone/db/util/SynchronizedVerifier.java | 2 +- .../lealone/db/util/ValueHashMap.java | 8 +- .../com.lealone.db.session.SessionFactory | 1 + .../org.lealone.db.session.SessionFactory | 1 - .../lealone/common/resources/help.csv | 6 +- lealone-dist/bin/lealone.bat | 2 +- lealone-dist/bin/lealone.sh | 2 +- lealone-dist/pom.xml | 6 +- lealone-main/pom.xml | 18 +- .../{org => com}/lealone/main/Lealone.java | 58 +-- .../java/{org => com}/lealone/main/Shell.java | 6 +- .../lealone/main/config/Config.java | 8 +- .../lealone/main/config/ConfigLoader.java | 4 +- .../lealone/main/config/YamlConfigLoader.java | 15 +- .../lealone/main/config/YamlConstructor.java | 2 +- lealone-net/pom.xml | 4 +- .../lealone/net/AsyncConnection.java | 6 +- .../lealone/net/AsyncConnectionManager.java | 4 +- .../lealone/net/AsyncConnectionPool.java | 6 +- .../{org => com}/lealone/net/NetBuffer.java | 2 +- .../lealone/net/NetBufferFactory.java | 6 +- .../lealone/net/NetBufferInputStream.java | 2 +- .../lealone/net/NetBufferOutputStream.java | 4 +- .../{org => com}/lealone/net/NetClient.java | 6 +- .../lealone/net/NetClientBase.java | 14 +- .../lealone/net/NetEventLoop.java | 6 +- .../{org => com}/lealone/net/NetFactory.java | 4 +- .../lealone/net/NetFactoryBase.java | 6 +- .../lealone/net/NetFactoryManager.java | 12 +- .../lealone/net/NetScheduler.java | 10 +- .../{org => com}/lealone/net/NetServer.java | 4 +- .../lealone/net/NetServerBase.java | 10 +- .../lealone/net/TcpClientConnection.java | 14 +- .../lealone/net/TransferConnection.java | 18 +- .../lealone/net/TransferInputStream.java | 70 ++-- .../lealone/net/TransferOutputStream.java | 42 +-- .../lealone/net/WritableChannel.java | 2 +- .../lealone/net/bio/BioNetClient.java | 22 +- .../lealone/net/bio/BioNetFactory.java | 10 +- .../lealone/net/bio/BioWritableChannel.java | 20 +- .../lealone/net/nio/NioAttachment.java | 6 +- .../lealone/net/nio/NioBuffer.java | 6 +- .../lealone/net/nio/NioBufferFactory.java | 8 +- .../lealone/net/nio/NioClient.java | 18 +- .../lealone/net/nio/NioEventLoop.java | 32 +- .../lealone/net/nio/NioNetFactory.java | 10 +- .../lealone/net/nio/NioServerAccepter.java | 12 +- .../lealone/net/nio/NioWritableChannel.java | 10 +- lealone-plugins/mongo/pom.xml | 4 +- .../lealone/plugins/mongo/bson/BsonBase.java | 45 +-- .../mongo/bson/command/BCAggregate.java | 27 +- .../plugins/mongo/bson/command/BCDelete.java | 15 +- .../plugins/mongo/bson/command/BCFind.java | 25 +- .../plugins/mongo/bson/command/BCInsert.java | 27 +- .../plugins/mongo/bson/command/BCUpdate.java | 17 +- .../mongo/bson/command/BsonCommand.java | 51 +-- .../mongo/bson/command/admin/ACCreate.java | 9 +- .../mongo/bson/command/admin/ACDrop.java | 9 +- .../bson/command/admin/AdminCommand.java | 19 +- .../mongo/bson/command/auth/AuthCommand.java | 19 +- .../bson/command/auth/ScramSaslProcessor.java | 4 +- .../auth/ScramServerFunctionality.java | 6 +- .../command/diagnostic/DiagnosticCommand.java | 9 +- .../bson/command/index/ICCreateIndexes.java | 11 +- .../bson/command/index/ICDropIndexes.java | 15 +- .../bson/command/index/ICListIndexes.java | 15 +- .../bson/command/index/IndexCommand.java | 9 +- .../mongo/bson/command/legacy/LCDelete.java | 5 +- .../mongo/bson/command/legacy/LCInsert.java | 5 +- .../mongo/bson/command/legacy/LCQuery.java | 7 +- .../mongo/bson/command/legacy/LCUpdate.java | 5 +- .../bson/command/legacy/LegacyCommand.java | 4 +- .../mongo/bson/command/role/RoleCommand.java | 9 +- .../command/sessions/SessionsCommand.java | 13 +- .../mongo/bson/command/user/UserCommand.java | 17 +- .../bson/operator/BOAggregateOperator.java | 27 +- .../mongo/bson/operator/BOQueryOperator.java | 19 +- .../mongo/bson/operator/BOUpdateOperator.java | 25 +- .../mongo/bson/operator/BsonOperator.java | 13 +- .../plugins/mongo/server/MongoServer.java | 10 +- .../mongo/server/MongoServerConnection.java | 41 +-- .../mongo/server/MongoServerEngine.java | 6 +- .../plugins/mongo/server/MongoTask.java | 17 +- .../com.lealone.server.ProtocolServerEngine | 1 + .../org.lealone.server.ProtocolServerEngine | 1 - lealone-plugins/mysql/pom.xml | 4 +- .../plugins/mysql/server/MySQLServer.java | 18 +- .../mysql/server/MySQLServerConnection.java | 80 ++--- .../mysql/server/MySQLServerEngine.java | 6 +- .../server/handler/AuthPacketHandler.java | 8 +- .../server/handler/CommandPacketHandler.java | 14 +- .../mysql/server/handler/PacketHandler.java | 4 +- .../mysql/server/protocol/AuthPacket.java | 4 +- .../mysql/server/protocol/EOFPacket.java | 2 +- .../mysql/server/protocol/ErrorCode.java | 2 +- .../mysql/server/protocol/ErrorPacket.java | 2 +- .../mysql/server/protocol/ExecutePacket.java | 36 +- .../mysql/server/protocol/FieldPacket.java | 2 +- .../plugins/mysql/server/protocol/Fields.java | 6 +- .../server/protocol/HandshakePacket.java | 10 +- .../mysql/server/protocol/InitDbPacket.java | 2 +- .../mysql/server/protocol/OkPacket.java | 2 +- .../plugins/mysql/server/protocol/Packet.java | 6 +- .../mysql/server/protocol/PacketInput.java | 8 +- .../mysql/server/protocol/PacketOutput.java | 8 +- .../mysql/server/protocol/PacketType.java | 2 +- .../server/protocol/PreparedOkPacket.java | 2 +- .../mysql/server/protocol/RequestPacket.java | 2 +- .../mysql/server/protocol/ResponsePacket.java | 2 +- .../protocol/ResultSetHeaderPacket.java | 2 +- .../mysql/server/protocol/RowDataPacket.java | 2 +- .../mysql/server/util/Capabilities.java | 2 +- .../mysql/server/util/CharsetUtil.java | 2 +- .../plugins/mysql/server/util/RandomUtil.java | 2 +- .../mysql/server/util/SecurityUtil.java | 4 +- .../plugins/mysql/sql/MySQLEngine.java | 10 +- .../plugins/mysql/sql/MySQLParser.java | 56 +-- .../plugins/mysql/sql/ddl/CreateFunction.java | 20 +- .../mysql/sql/ddl/CreateProcedure.java | 20 +- .../plugins/mysql/sql/ddl/CreateRoutine.java | 16 +- .../mysql/sql/expression/MySQLVariable.java | 14 +- .../sql/expression/function/BitFunction.java | 12 +- .../function/InformationFunction.java | 18 +- .../expression/function/MySQLFunction.java | 10 +- .../function/MySQLFunctionFactory.java | 12 +- .../function/PerformanceSchemaFunction.java | 14 +- .../sql/expression/function/UserFunction.java | 6 +- .../com.lealone.server.ProtocolServerEngine | 1 + .../services/com.lealone.sql.SQLEngine | 1 + .../org.lealone.server.ProtocolServerEngine | 1 - .../services/org.lealone.sql.SQLEngine | 1 - lealone-plugins/pom.xml | 4 +- lealone-plugins/postgresql/pom.xml | 4 +- .../plugins/postgresql/server/PgServer.java | 38 +- .../postgresql/server/PgServerConnection.java | 32 +- .../postgresql/server/PgServerEngine.java | 6 +- .../plugins/postgresql/server/PgTask.java | 6 +- .../plugins/postgresql/server/PgType.java | 4 +- .../server/handler/AuthPacketHandler.java | 6 +- .../server/handler/CommandPacketHandler.java | 36 +- .../server/handler/PacketHandler.java | 24 +- .../postgresql/server/io/NetBufferInput.java | 4 +- .../postgresql/server/io/NetBufferOutput.java | 8 +- .../plugins/postgresql/sql/PgAlias.java | 8 +- .../plugins/postgresql/sql/PgSQLEngine.java | 8 +- .../plugins/postgresql/sql/PgSQLParser.java | 22 +- .../postgresql/sql/expression/PgVariable.java | 12 +- .../sql/expression/function/PgFunction.java | 10 +- .../function/PgFunctionFactory.java | 10 +- .../SystemCatalogInformationFunction.java | 16 +- .../com.lealone.server.ProtocolServerEngine | 1 + .../services/com.lealone.sql.SQLEngine | 1 + .../org.lealone.server.ProtocolServerEngine | 1 - .../services/org.lealone.sql.SQLEngine | 1 - .../postgresql/resources/pg_catalog.sql | 24 +- lealone-sci/pom.xml | 4 +- .../{org => com}/lealone/db/lock/Lock.java | 6 +- .../lealone/db/lock/LockOwner.java | 6 +- .../lealone/db/lock/NullLockOwner.java | 2 +- .../lealone/db/lock/SimpleLockOwner.java | 4 +- lealone-server/pom.xml | 6 +- .../lealone/server/AsyncServer.java | 26 +- .../lealone/server/AsyncServerConnection.java | 8 +- .../lealone/server/AsyncServerManager.java | 6 +- .../lealone/server/TcpServer.java | 10 +- .../lealone/server/TcpServerConnection.java | 40 +-- .../lealone/server/TcpServerEngine.java | 2 +- .../handler/BatchStatementPacketHandlers.java | 24 +- .../server/handler/LobPacketHandlers.java | 28 +- .../lealone/server/handler/PacketHandler.java | 8 +- .../server/handler/PacketHandlers.java | 32 +- .../PreparedStatementPacketHandlers.java | 32 +- .../server/handler/ResultPacketHandlers.java | 22 +- .../server/handler/SessionPacketHandlers.java | 18 +- .../handler/StatementListPacketHandlers.java | 24 +- .../handler/StatementPacketHandlers.java | 12 +- .../server/scheduler/GlobalScheduler.java | 36 +- .../server/scheduler/LinkableTask.java | 6 +- .../server/scheduler/PacketHandleTask.java | 22 +- .../lealone/server/scheduler/SessionInfo.java | 24 +- .../server/scheduler/SessionInitTask.java | 8 +- .../server/scheduler/SessionValidator.java | 8 +- .../com.lealone.server.ProtocolServerEngine | 1 + .../org.lealone.server.ProtocolServerEngine | 1 - lealone-sql/pom.xml | 4 +- .../lealone/sql/LealoneSQLEngine.java | 6 +- .../lealone/sql/LealoneSQLParser.java | 4 +- .../lealone/sql/SQLEngineBase.java | 28 +- .../lealone/sql/SQLParserBase.java | 330 +++++++++--------- .../lealone/sql/StatementBase.java | 44 +-- .../lealone/sql/StatementList.java | 10 +- .../lealone/sql/admin/AdminStatement.java | 6 +- .../lealone/sql/admin/CreatePlugin.java | 22 +- .../lealone/sql/admin/DropPlugin.java | 18 +- .../lealone/sql/admin/ShutdownDatabase.java | 12 +- .../lealone/sql/admin/ShutdownPlugin.java | 16 +- .../lealone/sql/admin/ShutdownServer.java | 20 +- .../lealone/sql/admin/StartPlugin.java | 16 +- .../lealone/sql/admin/StartServer.java | 12 +- .../lealone/sql/ddl/AlterDatabase.java | 14 +- .../lealone/sql/ddl/AlterIndexRename.java | 22 +- .../lealone/sql/ddl/AlterSchemaRename.java | 18 +- .../lealone/sql/ddl/AlterSequence.java | 22 +- .../sql/ddl/AlterTableAddConstraint.java | 42 +-- .../sql/ddl/AlterTableAlterColumn.java | 42 +-- .../sql/ddl/AlterTableDropConstraint.java | 22 +- .../lealone/sql/ddl/AlterTableRename.java | 18 +- .../sql/ddl/AlterTableRenameColumn.java | 24 +- .../lealone/sql/ddl/AlterTableSet.java | 16 +- .../lealone/sql/ddl/AlterUser.java | 16 +- .../lealone/sql/ddl/AlterView.java | 18 +- .../{org => com}/lealone/sql/ddl/Analyze.java | 10 +- .../lealone/sql/ddl/AuthStatement.java | 4 +- .../lealone/sql/ddl/CreateAggregate.java | 18 +- .../lealone/sql/ddl/CreateConstant.java | 22 +- .../lealone/sql/ddl/CreateDatabase.java | 24 +- .../lealone/sql/ddl/CreateFunctionAlias.java | 20 +- .../lealone/sql/ddl/CreateIndex.java | 26 +- .../lealone/sql/ddl/CreateRole.java | 16 +- .../lealone/sql/ddl/CreateSchema.java | 18 +- .../lealone/sql/ddl/CreateSequence.java | 22 +- .../lealone/sql/ddl/CreateService.java | 68 ++-- .../lealone/sql/ddl/CreateTable.java | 52 +-- .../lealone/sql/ddl/CreateTrigger.java | 24 +- .../lealone/sql/ddl/CreateUser.java | 22 +- .../lealone/sql/ddl/CreateUserDataType.java | 24 +- .../lealone/sql/ddl/CreateView.java | 30 +- .../lealone/sql/ddl/DatabaseStatement.java | 10 +- .../lealone/sql/ddl/DeallocateProcedure.java | 6 +- .../lealone/sql/ddl/DefinitionStatement.java | 6 +- .../lealone/sql/ddl/DropAggregate.java | 20 +- .../lealone/sql/ddl/DropConstant.java | 20 +- .../lealone/sql/ddl/DropDatabase.java | 18 +- .../lealone/sql/ddl/DropFunctionAlias.java | 20 +- .../lealone/sql/ddl/DropIndex.java | 24 +- .../lealone/sql/ddl/DropRole.java | 18 +- .../lealone/sql/ddl/DropSchema.java | 16 +- .../lealone/sql/ddl/DropSequence.java | 18 +- .../lealone/sql/ddl/DropService.java | 20 +- .../lealone/sql/ddl/DropTable.java | 28 +- .../lealone/sql/ddl/DropTrigger.java | 22 +- .../lealone/sql/ddl/DropUser.java | 16 +- .../lealone/sql/ddl/DropUserDataType.java | 20 +- .../lealone/sql/ddl/DropView.java | 28 +- .../lealone/sql/ddl/GrantRevoke.java | 28 +- .../lealone/sql/ddl/PrepareProcedure.java | 12 +- .../lealone/sql/ddl/RepairTable.java | 10 +- .../lealone/sql/ddl/SchemaStatement.java | 12 +- .../lealone/sql/ddl/SetComment.java | 26 +- .../lealone/sql/ddl/TruncateTable.java | 18 +- .../lealone/sql/ddl/UserStatement.java | 6 +- .../{org => com}/lealone/sql/dml/Backup.java | 12 +- .../{org => com}/lealone/sql/dml/Call.java | 18 +- .../{org => com}/lealone/sql/dml/Delete.java | 22 +- .../lealone/sql/dml/ExecuteProcedure.java | 16 +- .../lealone/sql/dml/ExecuteService.java | 22 +- .../lealone/sql/dml/ExecuteStatement.java | 8 +- .../{org => com}/lealone/sql/dml/Explain.java | 28 +- .../lealone/sql/dml/GenScript.java | 84 ++--- .../{org => com}/lealone/sql/dml/Insert.java | 20 +- .../sql/dml/ManipulationStatement.java | 6 +- .../{org => com}/lealone/sql/dml/MerSert.java | 40 +-- .../{org => com}/lealone/sql/dml/Merge.java | 36 +- .../lealone/sql/dml/NoOperation.java | 6 +- .../lealone/sql/dml/RunScript.java | 14 +- .../lealone/sql/dml/ScriptBase.java | 30 +- .../lealone/sql/dml/SetDatabase.java | 26 +- .../lealone/sql/dml/SetSession.java | 14 +- .../lealone/sql/dml/SetStatement.java | 20 +- .../lealone/sql/dml/TransactionStatement.java | 8 +- .../{org => com}/lealone/sql/dml/UpDel.java | 42 +-- .../{org => com}/lealone/sql/dml/Update.java | 38 +- .../lealone/sql/executor/YieldableBase.java | 36 +- .../sql/executor/YieldableLocalUpdate.java | 10 +- .../sql/executor/YieldableLoopUpdateBase.java | 10 +- .../sql/executor/YieldableUpdateBase.java | 8 +- .../lealone/sql/expression/Alias.java | 10 +- .../lealone/sql/expression/Expression.java | 36 +- .../sql/expression/ExpressionColumn.java | 42 +-- .../sql/expression/ExpressionList.java | 14 +- .../lealone/sql/expression/Operation.java | 24 +- .../lealone/sql/expression/Parameter.java | 24 +- .../lealone/sql/expression/Rownum.java | 12 +- .../lealone/sql/expression/SelectOrderBy.java | 2 +- .../lealone/sql/expression/SequenceValue.java | 14 +- .../sql/expression/ValueExpression.java | 22 +- .../lealone/sql/expression/Variable.java | 10 +- .../lealone/sql/expression/Wildcard.java | 18 +- .../sql/expression/aggregate/ACount.java | 16 +- .../sql/expression/aggregate/ACountAll.java | 14 +- .../sql/expression/aggregate/ADefault.java | 26 +- .../expression/aggregate/AGroupConcat.java | 26 +- .../sql/expression/aggregate/AHistogram.java | 20 +- .../expression/aggregate/ASelectivity.java | 16 +- .../sql/expression/aggregate/Aggregate.java | 8 +- .../expression/aggregate/AggregateData.java | 6 +- .../aggregate/BuiltInAggregate.java | 36 +- .../expression/aggregate/JavaAggregate.java | 30 +- .../sql/expression/condition/CompareLike.java | 34 +- .../sql/expression/condition/Comparison.java | 34 +- .../sql/expression/condition/Condition.java | 8 +- .../expression/condition/ConditionAndOr.java | 22 +- .../expression/condition/ConditionExists.java | 18 +- .../sql/expression/condition/ConditionIn.java | 30 +- .../condition/ConditionInConstantSet.java | 22 +- .../condition/ConditionInSelect.java | 36 +- .../expression/condition/ConditionNot.java | 16 +- .../evaluator/AlwaysTrueEvaluator.java | 2 +- .../evaluator/ExpressionEvaluator.java | 2 +- .../evaluator/ExpressionInterpreter.java | 6 +- .../expression/function/BuiltInFunction.java | 28 +- .../function/BuiltInFunctionExt.java | 4 +- .../function/BuiltInFunctionFactory.java | 4 +- .../expression/function/DateTimeFunction.java | 36 +- .../sql/expression/function/Function.java | 16 +- .../expression/function/FunctionFactory.java | 4 +- .../expression/function/FunctionIndex.java | 26 +- .../sql/expression/function/FunctionInfo.java | 2 +- .../expression/function/FunctionTable.java | 34 +- .../sql/expression/function/JavaFunction.java | 30 +- .../expression/function/NumericFunction.java | 44 +-- .../expression/function/StringFunction.java | 34 +- .../expression/function/SystemFunction.java | 64 ++-- .../expression/function/TableFunction.java | 38 +- .../sql/expression/subquery/SubQuery.java | 24 +- .../expression/subquery/SubQueryResult.java | 14 +- .../expression/subquery/SubQueryRowList.java | 8 +- .../visitor/BooleanExpressionVisitor.java | 62 ++-- .../expression/visitor/ColumnsVisitor.java | 6 +- .../visitor/DependenciesVisitor.java | 18 +- .../visitor/DeterministicVisitor.java | 16 +- .../visitor/EvaluatableVisitor.java | 6 +- .../expression/visitor/ExpressionVisitor.java | 102 ++++++ .../visitor/ExpressionVisitorBase.java | 2 +- .../visitor/ExpressionVisitorFactory.java | 10 +- .../visitor/IndependentVisitor.java | 10 +- .../expression/visitor/MapColumnsVisitor.java | 26 +- .../visitor/MaxModificationIdVisitor.java | 10 +- .../visitor/NotFromResolverVisitor.java | 6 +- .../visitor/OptimizableVisitor.java | 16 +- .../visitor/QueryComparableVisitor.java | 8 +- .../visitor/UpdateAggregateVisitor.java | 12 +- .../visitor/VoidExpressionVisitor.java | 62 ++-- .../lealone/sql/operator/Operator.java | 4 +- .../lealone/sql/operator/OperatorFactory.java | 8 +- .../sql/operator/OperatorFactoryBase.java | 6 +- .../sql/optimizer/AliasColumnResolver.java | 18 +- .../lealone/sql/optimizer/ColumnResolver.java | 18 +- .../sql/optimizer/ColumnResolverBase.java | 2 +- .../lealone/sql/optimizer/IndexCondition.java | 30 +- .../lealone/sql/optimizer/IndexCursor.java | 32 +- .../lealone/sql/optimizer/Optimizer.java | 12 +- .../lealone/sql/optimizer/Permutations.java | 4 +- .../lealone/sql/optimizer/Plan.java | 6 +- .../lealone/sql/optimizer/PlanItem.java | 4 +- .../sql/optimizer/SingleColumnResolver.java | 12 +- .../lealone/sql/optimizer/TableFilter.java | 48 +-- .../lealone/sql/optimizer/TableIterator.java | 12 +- .../lealone/sql/query/QAggregate.java | 6 +- .../lealone/sql/query/QAggregateQuick.java | 4 +- .../lealone/sql/query/QCache.java | 4 +- .../lealone/sql/query/QDistinct.java | 10 +- .../lealone/sql/query/QEmpty.java | 2 +- .../{org => com}/lealone/sql/query/QFlat.java | 4 +- .../lealone/sql/query/QGroup.java | 14 +- .../lealone/sql/query/QGroupSorted.java | 4 +- .../lealone/sql/query/QOperator.java | 26 +- .../{org => com}/lealone/sql/query/Query.java | 64 ++-- .../lealone/sql/query/QueryResultCache.java | 14 +- .../lealone/sql/query/Select.java | 80 ++--- .../lealone/sql/query/SelectUnion.java | 50 +-- .../sql/query/YieldableLocalQuery.java | 12 +- .../lealone/sql/query/YieldableQueryBase.java | 12 +- .../lealone/sql/query/YieldableSelect.java | 26 +- .../sql/query/YieldableSelectUnion.java | 28 +- .../expression/visitor/ExpressionVisitor.java | 102 ------ .../services/com.lealone.sql.SQLEngine | 1 + .../services/org.lealone.sql.SQLEngine | 1 - lealone-test/pom.xml | 4 +- .../lealone/test/LealoneStart.java | 4 +- .../{org => com}/lealone/test/TestBase.java | 23 +- .../lealone/test/UnitTestBase.java | 4 +- .../test/aose/AOStorageEngineTest.java | 19 +- .../lealone/test/aose/AOStorageTest.java | 9 +- .../lealone/test/aose/AoseTestBase.java | 12 +- .../lealone/test/aose/BTreeGCTest.java | 2 +- .../lealone/test/aose/BTreeMapTest.java | 9 +- .../lealone/test/aose/BTreeStorageTest.java | 2 +- .../lealone/test/aose/CompactTest.java | 2 +- .../test/aose/ConcurrentStorageMapTest.java | 5 +- .../lealone/test/aose/FlushDirtyPageTest.java | 2 +- .../lealone/test/aose/LobStorageTest.java | 13 +- .../lealone/test/aose/MemoryStorageTest.java | 7 +- .../lealone/test/aose/PageOperationTest.java | 2 +- .../test/aose/PageStorageModeSqlTest.java | 9 +- .../test/aose/PageStorageModeTest.java | 31 +- .../lealone/test/aose/PageUtilsTest.java | 5 +- .../lealone/test/aose/StorageSqlTest.java | 5 +- .../lealone/test/aote/AoteTestBase.java | 17 +- .../test/aote/ConcurrentTransactionTest.java | 7 +- .../lealone/test/aote/IsolationLevelTest.java | 7 +- .../test/aote/TransactionCommitTest.java | 7 +- .../test/aote/TransactionEngineTest.java | 15 +- .../lealone/test/aote/TransactionMapTest.java | 9 +- .../lealone/test/aote/TransactionTest.java | 9 +- .../test/aote/TransactionalValueTest.java | 21 +- .../client/AsyncConcurrentUpdateTest.java | 9 +- .../lealone/test/client/BatchTest.java | 5 +- .../lealone/test/client/ClientTestBase.java | 4 +- .../lealone/test/client/JdbcArrayTest.java | 5 +- .../lealone/test/client/JdbcBlobTest.java | 5 +- .../client/JdbcCallableStatementTest.java | 2 +- .../test/client/JdbcClobEmbedTest.java | 6 +- .../lealone/test/client/JdbcClobTest.java | 5 +- .../test/client/JdbcConnectionTest.java | 11 +- .../test/client/JdbcDatabaseMetaDataTest.java | 2 +- .../lealone/test/client/JdbcDriverTest.java | 7 +- .../client/JdbcPreparedStatementTest.java | 9 +- .../test/client/JdbcStatementTest.java | 7 +- .../test/client/LealoneClientTest.java | 12 +- .../test/client/SharedConnectionTest.java | 16 +- .../lealone/test/client/TraceTest.java | 5 +- .../lealone/test/db/CommentTest.java | 11 +- .../lealone/test/db/ConnectionInfoTest.java | 7 +- .../lealone/test/db/DatabaseTest.java | 13 +- .../lealone/test/db/DbObjectTestBase.java | 25 +- .../lealone/test/db/DbTestBase.java | 10 +- .../test/db/ServerSessionFactoryTest.java | 9 +- .../lealone/test/db/SessionTest.java | 7 +- .../lealone/test/db/auth/RightTest.java | 19 +- .../lealone/test/db/auth/RoleTest.java | 13 +- .../lealone/test/db/auth/UserTest.java | 11 +- .../db/constraint/ConstraintCheckTest.java | 5 +- .../constraint/ConstraintReferentialTest.java | 5 +- .../db/constraint/ConstraintTestBase.java | 6 +- .../db/constraint/ConstraintUniqueTest.java | 5 +- .../test/db/index/IndexRebuildTest.java | 7 +- .../lealone/test/db/index/IndexTest.java | 11 +- .../lealone/test/db/index/IndexTestBase.java | 8 +- .../test/db/index/NonUniqueHashIndexTest.java | 2 +- .../test/db/index/UniqueHashIndexTest.java | 5 +- .../lealone/test/db/schema/ConstantTest.java | 9 +- .../test/db/schema/FunctionAliasTest.java | 7 +- .../lealone/test/db/schema/SchemaTest.java | 9 +- .../lealone/test/db/schema/SequenceTest.java | 11 +- .../test/db/schema/TriggerObjectTest.java | 23 +- .../test/db/schema/UserAggregateTest.java | 11 +- .../test/db/schema/UserDataTypeTest.java | 9 +- .../test/db/table/FunctionTableTest.java | 9 +- .../lealone/test/db/table/MetaTableTest.java | 11 +- .../lealone/test/db/table/RangeTableTest.java | 9 +- .../lealone/test/db/table/TableTest.java | 11 +- .../lealone/test/db/table/ViewTest.java | 9 +- .../lealone/test/fs/FileEncryptTest.java | 9 +- .../lealone/test/fs/FilePathTest.java | 5 +- .../lealone/test/fs/FileStorageTest.java | 13 +- .../lealone/test/fs/FsTestBase.java | 4 +- .../lealone/test/main/LealoneTest.java | 4 +- .../lealone/test/main/ShellTest.java | 4 +- .../lealone/test/misc/CRUDExample.java | 7 +- .../lealone/test/misc/DeleteTestData.java | 6 +- .../lealone/test/misc/EmbeddedExample.java | 10 +- .../lealone/test/misc/ExclusiveModeTest.java | 5 +- .../lealone/test/misc/JavaObjectSizeTest.java | 28 +- .../lealone/test/misc/MemDiskTest.java | 4 +- .../test/misc/QueryStatisticsTest.java | 7 +- .../test/misc/SchedulerYieldBugTest.java | 7 +- .../lealone/test/misc/SourceCompilerTest.java | 4 +- .../lealone/test/misc/WrongPasswordTest.java | 6 +- .../test/plugins/PluginManagerTest.java | 11 +- .../lealone/test/plugins/PluginTest.java | 11 +- .../plugins/mongo/BsonAdminCommandTest.java | 2 +- .../test/plugins/mongo/BsonAggregateTest.java | 2 +- .../mongo/BsonAuthenticationCommandTest.java | 2 +- .../test/plugins/mongo/BsonFilterTest.java | 2 +- .../test/plugins/mongo/BsonIndexTest.java | 2 +- .../test/plugins/mongo/BsonTypeTest.java | 2 +- .../plugins/mongo/BsonUpdateOperatorTest.java | 2 +- .../test/plugins/mongo/MongoArrayTest.java | 2 +- .../test/plugins/mongo/MongoCrudTest.java | 2 +- .../test/plugins/mongo/MongoIdTest.java | 2 +- .../test/plugins/mongo/MongoTestBase.java | 6 +- .../lealone/test/plugins/mongo/MqlTest.java | 2 +- .../plugins/mysql/CatalogStatementTest.java | 2 +- .../mysql/JdbcDatabaseMetaDataTest.java | 2 +- .../test/plugins/mysql/MySQLJdbcTest.java | 2 +- .../plugins/mysql/MySQLShowStatementTest.java | 2 +- .../test/plugins/mysql/MySQLSyntaxTest.java | 2 +- .../test/plugins/mysql/MySQLTestBase.java | 7 +- .../test/plugins/mysql/PasswordTest.java | 9 +- .../test/plugins/postgresql/PgJdbcTest.java | 2 +- .../test/plugins/postgresql/PgSyntaxTest.java | 2 +- .../test/plugins/postgresql/PgTestBase.java | 7 +- .../lealone/test/sql/SqlTestBase.java | 15 +- .../test/sql/admin/ShutdownDatabaseTest.java | 11 +- .../test/sql/admin/ShutdownServerTest.java | 9 +- .../lealone/test/sql/ddl/AlterUserTest.java | 7 +- .../test/sql/ddl/DatabaseStatementTest.java | 7 +- .../test/sql/ddl/TruncateTableTest.java | 5 +- .../lealone/test/sql/dml/BackupTest.java | 5 +- .../lealone/test/sql/dml/CallTest.java | 5 +- .../lealone/test/sql/dml/DeleteTest.java | 5 +- .../test/sql/dml/ExecuteProcedureTest.java | 5 +- .../lealone/test/sql/dml/ExplainTest.java | 5 +- .../lealone/test/sql/dml/InsertTest.java | 5 +- .../lealone/test/sql/dml/MergeTest.java | 9 +- .../lealone/test/sql/dml/ScriptTest.java | 5 +- .../sql/dml/SequenceLockedExceptionTest.java | 5 +- .../lealone/test/sql/dml/SetTest.java | 9 +- .../sql/dml/TransactionStatementTest.java | 5 +- .../lealone/test/sql/dml/UpdateTest.java | 5 +- .../test/sql/expression/CompareLikeTest.java | 5 +- .../sql/expression/ConditionExistsTest.java | 5 +- .../ConditionInConstantSetTest.java | 5 +- .../sql/expression/ConditionInSelectTest.java | 2 +- .../test/sql/expression/ConditionInTest.java | 5 +- .../sql/expression/ExpressionColumnTest.java | 5 +- .../sql/expression/ExpressionListTest.java | 5 +- .../test/sql/expression/ExpressionTest.java | 5 +- .../test/sql/expression/RownumTest.java | 5 +- .../test/sql/expression/SubQueryTest.java | 5 +- .../test/sql/expression/VariableTest.java | 5 +- .../test/sql/expression/WildcardTest.java | 5 +- .../sql/function/AggregateFunctionTest.java | 7 +- .../sql/function/DateTimeFunctionTest.java | 13 +- .../test/sql/function/JavaFunctionTest.java | 7 +- .../sql/function/NumericFunctionTest.java | 5 +- .../test/sql/function/StringFunctionTest.java | 5 +- .../test/sql/function/SystemFunctionTest.java | 11 +- .../test/sql/function/TableFunctionTest.java | 5 +- .../test/sql/index/AsyncIndexTest.java | 7 +- .../index/AutoIncrementPrimaryIndexTest.java | 5 +- .../test/sql/index/DelegateIndexTest.java | 5 +- .../lealone/test/sql/index/IndexTest.java | 7 +- .../test/sql/index/MainIndexColumnTest.java | 5 +- .../test/sql/index/UniqueIndexTest.java | 7 +- .../test/sql/lock/DbObjectLockTest.java | 5 +- .../lealone/test/sql/lock/DeadlockTest.java | 5 +- .../test/sql/lock/JdkReadWriteLockTest.java | 2 +- .../lealone/test/sql/lock/RowLockTest.java | 11 +- .../lealone/test/sql/lock/TableLockTest.java | 5 +- .../test/sql/onlineddl/OnlineDDLTest.java | 7 +- .../sql/priority/StatementPriorityTest.java | 8 +- .../test/sql/query/DistinctQueryTest.java | 5 +- .../lealone/test/sql/query/JoinTest.java | 7 +- .../test/sql/query/PseudoColumnTest.java | 5 +- .../sql/query/QuickAggregateQueryTest.java | 5 +- .../lealone/test/sql/query/SelectTest.java | 5 +- .../test/sql/query/SelectUnionTest.java | 7 +- .../test/sql/query/ShowStatementTest.java | 7 +- .../lealone/test/sql/service/ServiceTest.java | 9 +- .../test/sql/transaction/CommitTest.java | 7 +- .../sql/transaction/ReaCommittedTest.java | 7 +- .../sql/transaction/RepeatableReadTest.java | 5 +- .../test/sql/transaction/TransactionTest.java | 5 +- .../sql/transaction/TransactionalDDLTest.java | 16 +- .../test/sql/transaction/UpdateLossTest.java | 5 +- .../test/sql/type/CollectionTypeTest.java | 5 +- .../lealone/test/sql/type/EnumTypeTest.java | 5 +- pom.xml | 4 +- 998 files changed, 6811 insertions(+), 6645 deletions(-) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/AOStorage.java (86%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/AOStorageBuilder.java (87%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/AOStorageEngine.java (66%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/BTreeCursor.java (93%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/BTreeGC.java (96%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/BTreeMap.java (92%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/BTreeStorage.java (92%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/chunk/Chunk.java (96%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/chunk/ChunkCompactor.java (95%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/chunk/ChunkManager.java (94%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/ColumnPage.java (92%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/LeafPage.java (97%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/LocalPage.java (95%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/NodePage.java (96%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/Page.java (95%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/PageInfo.java (98%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/PageOperations.java (97%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/PageReference.java (96%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/PageStorageMode.java (85%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/PageUtils.java (98%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/btree/page/PrettyPagePrinter.java (98%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/lob/LobStreamMap.java (98%) rename lealone-aose/src/main/java/{org => com}/lealone/storage/aose/lob/LobStreamStorage.java (96%) create mode 100644 lealone-aose/src/main/resources/META-INF/services/com.lealone.storage.StorageEngine delete mode 100644 lealone-aose/src/main/resources/META-INF/services/org.lealone.storage.StorageEngine rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/AOTransaction.java (91%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/AOTransactionEngine.java (92%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/AOTransactionMap.java (95%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/CheckpointService.java (96%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/TransactionalValue.java (95%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/TransactionalValueType.java (95%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/lock/InsertRowLock.java (79%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/lock/RowLock.java (77%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/lock/RowLockOwner.java (76%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/InstantLogSyncService.java (82%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/LogSyncService.java (92%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/NoLogSyncService.java (90%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/PeriodicLogSyncService.java (91%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/RedoLog.java (88%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/RedoLogChunk.java (94%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/RedoLogRecord.java (96%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/UndoLog.java (89%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/log/UndoLogRecord.java (90%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/tm/ConcurrentTransactionManager.java (89%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/tm/SingleThreadTransactionManager.java (90%) rename lealone-aote/src/main/java/{org => com}/lealone/transaction/aote/tm/TransactionManager.java (86%) create mode 100644 lealone-aote/src/main/resources/META-INF/services/com.lealone.transaction.TransactionEngine delete mode 100644 lealone-aote/src/main/resources/META-INF/services/org.lealone.transaction.TransactionEngine rename lealone-client/src/main/java/{org => com}/lealone/client/ClientScheduler.java (79%) rename lealone-client/src/main/java/{org => com}/lealone/client/ClientServiceProxy.java (92%) rename lealone-client/src/main/java/{org => com}/lealone/client/LealoneClient.java (97%) rename lealone-client/src/main/java/{org => com}/lealone/client/command/ClientPreparedSQLCommand.java (81%) rename lealone-client/src/main/java/{org => com}/lealone/client/command/ClientSQLCommand.java (82%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcArray.java (78%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcAsyncCallback.java (83%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcBatchUpdateException.java (98%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcBlob.java (92%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcCallableStatement.java (99%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcClob.java (91%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcConnection.java (98%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcDataSource.java (98%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcDataSourceFactory.java (91%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcDatabaseMetaData.java (99%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcDriver.java (95%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcParameterMetaData.java (95%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcPreparedStatement.java (97%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcResultSet.java (98%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcResultSetMetaData.java (98%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcSavepoint.java (91%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcStatement.java (98%) rename lealone-client/src/main/java/{org => com}/lealone/client/jdbc/JdbcWrapper.java (86%) rename lealone-client/src/main/java/{org => com}/lealone/client/result/ClientResult.java (89%) rename lealone-client/src/main/java/{org => com}/lealone/client/result/ClientResultColumn.java (95%) rename lealone-client/src/main/java/{org => com}/lealone/client/result/RowCountDeterminedClientResult.java (89%) rename lealone-client/src/main/java/{org => com}/lealone/client/result/RowCountUndeterminedClientResult.java (91%) rename lealone-client/src/main/java/{org => com}/lealone/client/result/UpdatableRow.java (95%) rename lealone-client/src/main/java/{org => com}/lealone/client/session/AutoReconnectSession.java (88%) rename lealone-client/src/main/java/{org => com}/lealone/client/session/ClientSession.java (87%) rename lealone-client/src/main/java/{org => com}/lealone/client/session/ClientSessionFactory.java (89%) create mode 100644 lealone-client/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory delete mode 100644 lealone-client/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory rename lealone-common/src/main/java/{org => com}/lealone/common/compress/CompressDeflate.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/compress/CompressLZF.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/compress/CompressNo.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/compress/CompressTool.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/compress/Compressor.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/compress/LZFInputStream.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/compress/LZFOutputStream.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/exceptions/ConfigException.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/common/exceptions/DbException.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/exceptions/JdbcSQLException.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/exceptions/UnsupportedSchemaException.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/common/logging/Logger.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/logging/LoggerFactory.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/common/logging/impl/ConsoleLogger.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/logging/impl/ConsoleLoggerFactory.java (76%) rename lealone-common/src/main/java/{org => com}/lealone/common/logging/impl/Log4j2Logger.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/logging/impl/Log4j2LoggerFactory.java (76%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/AES.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/BlockCipher.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/CipherFactory.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/EncryptionOptions.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/Fog.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/SHA256.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/security/XTEA.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/DefaultTrace.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/DefaultTraceWriter.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/NoTrace.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/Trace.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/TraceModuleType.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/TraceObject.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/TraceObjectType.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/TraceSystem.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/TraceWriter.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/trace/TraceWriterAdapter.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/Awaiter.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/BitField.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/CamelCaseHelper.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/CaseInsensitiveMap.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/DataUtils.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/DateTimeUtils.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/ExpiringMap.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/IOUtils.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/JdbcUtils.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/MapUtils.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/MathUtils.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/ScriptReader.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/ShutdownHookUtils.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/SmallLRUCache.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/SortedProperties.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/StatementBuilder.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/StringUtils.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/SystemPropertyUtils.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/Task.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/TempFileDeleter.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/ThreadUtils.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/common/util/Utils.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/Command.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/CommandParameter.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/db/ConnectionInfo.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/ConnectionSetting.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/Constants.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/DataBuffer.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/DataBufferFactory.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/DataHandler.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/db/DbSetting.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/db/LocalDataHandler.java (80%) rename lealone-common/src/main/java/{org => com}/lealone/db/ManualCloseable.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/db/MemoryManager.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/PluggableEngine.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/db/Plugin.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/PluginBase.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/PluginManager.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/RunMode.java (79%) rename lealone-common/src/main/java/{org => com}/lealone/db/SysProperties.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/db/api/Aggregate.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/api/DatabaseEventListener.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/api/ErrorCode.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/api/JavaObjectSerializer.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/api/Trigger.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/AsyncCallback.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/AsyncHandler.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/AsyncPeriodicTask.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/AsyncResult.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/AsyncTask.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/AsyncTaskHandler.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/ConcurrentAsyncCallback.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/FailedFuture.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/Future.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/SingleThreadAsyncCallback.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/async/SucceededFuture.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/link/Linkable.java (88%) rename lealone-common/src/main/java/{org => com}/lealone/db/link/LinkableBase.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/link/LinkableList.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/db/result/Result.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/result/SimpleResultSet.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/result/SimpleRowSource.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/EmbeddedScheduler.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/Scheduler.java (80%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/SchedulerBase.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/SchedulerFactory.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/SchedulerFactoryBase.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/SchedulerListener.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/SchedulerLock.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/scheduler/SchedulerThread.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/DelegatedSession.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/Session.java (88%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/SessionBase.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/SessionFactory.java (81%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/SessionFactoryBase.java (81%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/SessionSetting.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/session/SessionStatus.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ArrayBase.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/BlobBase.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ClobBase.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/CompareMode.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/CompareModeDefault.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/CompareModeIcu4J.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/DataType.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ReadonlyArray.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ReadonlyBlob.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ReadonlyClob.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/Value.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueArray.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueBoolean.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueByte.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueBytes.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueDate.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueDecimal.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueDouble.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueEnum.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueFloat.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueInt.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueJavaObject.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueList.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueLob.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueLong.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueMap.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueNull.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueResultSet.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueSet.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueShort.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueString.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueStringFixed.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueStringIgnoreCase.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueTime.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueTimestamp.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/db/value/ValueUuid.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/net/NetInputStream.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/net/NetNode.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/net/NetOutputStream.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/server/DelegatedProtocolServer.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/server/ProtocolServer.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/server/ProtocolServerBase.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/server/ProtocolServerEngine.java (85%) rename lealone-common/src/main/java/{org => com}/lealone/server/ProtocolServerEngineBase.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/AckPacket.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/AckPacketHandler.java (84%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/NoAckPacket.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/Packet.java (80%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/PacketDecoder.java (78%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/PacketDecoders.java (65%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/PacketType.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/QueryPacket.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/batch/BatchStatementUpdate.java (84%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/batch/BatchStatementUpdateAck.java (83%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/lob/LobRead.java (82%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/lob/LobReadAck.java (75%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementClose.java (77%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementGetMetaData.java (80%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementPrepare.java (82%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementPrepareAck.java (78%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java (83%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementQuery.java (85%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/ps/PreparedStatementUpdate.java (84%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/result/ResultChangeId.java (77%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/result/ResultClose.java (76%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/result/ResultFetchRows.java (80%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/result/ResultFetchRowsAck.java (84%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/result/ResultReset.java (76%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/session/SessionCancelStatement.java (77%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/session/SessionClose.java (73%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/session/SessionInit.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/session/SessionInitAck.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/session/SessionSetAutoCommit.java (77%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/statement/StatementQuery.java (83%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/statement/StatementQueryAck.java (82%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/statement/StatementUpdate.java (81%) rename lealone-common/src/main/java/{org => com}/lealone/server/protocol/statement/StatementUpdateAck.java (79%) rename lealone-common/src/main/java/{org => com}/lealone/sql/IExpression.java (89%) rename lealone-common/src/main/java/{org => com}/lealone/sql/IQuery.java (86%) rename lealone-common/src/main/java/{org => com}/lealone/sql/ISelectUnion.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/sql/ParsedSQLStatement.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/sql/PreparedSQLStatement.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/sql/SQLCommand.java (88%) rename lealone-common/src/main/java/{org => com}/lealone/sql/SQLEngine.java (73%) rename lealone-common/src/main/java/{org => com}/lealone/sql/SQLParser.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/sql/SQLStatement.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/storage/CursorParameters.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/storage/Storage.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageBase.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageBuilder.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageEngine.java (75%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageEngineBase.java (71%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageEventListener.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageMap.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageMapBase.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageMapCursor.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/storage/StorageSetting.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/FilePath.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/FileStorage.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/FileStorageInputStream.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/FileStorageOutputStream.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/FileUtils.java (99%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/FileBase.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/FileChannelInputStream.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/FileChannelOutputStream.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/FilePathWrapper.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/disk/FileDisk.java (95%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/disk/FilePathDisk.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/encrypt/FileEncrypt.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/nio/FileNio.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/storage/fs/impl/nio/FilePathNio.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/storage/lob/LobLocalStorage.java (96%) rename lealone-common/src/main/java/{org => com}/lealone/storage/lob/LobStorage.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/storage/page/IPage.java (84%) rename lealone-common/src/main/java/{org => com}/lealone/storage/page/PageOperation.java (83%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/BigIntegerType.java (94%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/CharacterType.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/ObjectArrayType.java (98%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/ObjectDataType.java (91%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/SerializedObjectType.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/StorageDataType.java (97%) rename lealone-common/src/main/java/{org => com}/lealone/storage/type/StorageDataTypeBase.java (86%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/ITransactionalValue.java (85%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/PendingTransaction.java (92%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/Transaction.java (90%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/TransactionEngine.java (87%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/TransactionEngineBase.java (84%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/TransactionMap.java (93%) rename lealone-common/src/main/java/{org => com}/lealone/transaction/TransactionMapCursor.java (75%) rename lealone-common/src/main/resources/{org => com}/lealone/common/resources/_messages_en.prop (100%) rename lealone-common/src/main/resources/{org => com}/lealone/common/resources/_messages_zh.prop (100%) rename lealone-common/src/main/resources/{org => com}/lealone/common/resources/version.properties (100%) rename lealone-db/src/main/java/{org => com}/lealone/db/Comment.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/Database.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/DbObject.java (95%) rename lealone-db/src/main/java/{org => com}/lealone/db/DbObjectBase.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/DbObjectType.java (99%) rename lealone-db/src/main/java/{org => com}/lealone/db/DbSettings.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/LealoneDatabase.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/MetaRecord.java (86%) rename lealone-db/src/main/java/{org => com}/lealone/db/Mode.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/PluginObject.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/Procedure.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/TransactionalDbObjects.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/PasswordHash.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/Right.java (92%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/RightOwner.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/Role.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/User.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/scram/ScramPasswordData.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/auth/scram/ScramPasswordHash.java (97%) rename lealone-db/src/main/java/{org => com}/lealone/db/constraint/Constraint.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/constraint/ConstraintCheck.java (87%) rename lealone-db/src/main/java/{org => com}/lealone/db/constraint/ConstraintReferential.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/constraint/ConstraintUnique.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/Cursor.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/Index.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/IndexBase.java (95%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/IndexColumn.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/IndexConditionType.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/IndexRebuilder.java (84%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/IndexType.java (99%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/MetaIndex.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/RangeIndex.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/ViewIndex.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/hash/HashIndex.java (82%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/hash/NonUniqueHashIndex.java (89%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/hash/UniqueHashIndex.java (85%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/IndexKey.java (83%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/IndexKeyType.java (86%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/StandardDelegateIndex.java (84%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/StandardIndex.java (69%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/StandardPrimaryIndex.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/StandardSecondaryIndex.java (92%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/UniqueKeyType.java (84%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/ValueDataType.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/VersionedValue.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/index/standard/VersionedValueType.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/lock/DbObjectLock.java (87%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/DelegatedResult.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/LocalResult.java (97%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/ResultExternal.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/ResultTarget.java (89%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/ResultTempTable.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/Row.java (84%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/RowBase.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/SearchRow.java (95%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/SimpleRow.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/SimpleRowValue.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/result/SortOrder.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/Constant.java (88%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/FunctionAlias.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/Schema.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/SchemaObject.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/SchemaObjectBase.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/Sequence.java (97%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/TriggerObject.java (95%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/UserAggregate.java (88%) rename lealone-db/src/main/java/{org => com}/lealone/db/schema/UserDataType.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/JavaServiceExecutor.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/JavaServiceExecutorFactory.java (92%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/JsonArrayGetter.java (74%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/Service.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/ServiceExecutor.java (94%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/ServiceExecutorBase.java (97%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/ServiceExecutorFactory.java (85%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/ServiceExecutorFactoryBase.java (81%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/ServiceMethod.java (92%) rename lealone-db/src/main/java/{org => com}/lealone/db/service/ServiceSetting.java (88%) rename lealone-db/src/main/java/{org => com}/lealone/db/session/ServerSession.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/session/ServerSessionFactory.java (86%) rename lealone-db/src/main/java/{org => com}/lealone/db/stat/QueryStatisticsData.java (99%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/Column.java (95%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/CreateTableData.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/DummyTable.java (88%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/InfoMetaTable.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/MetaTable.java (89%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/PerfMetaTable.java (91%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/RangeTable.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/StandardTable.java (92%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/Table.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableAlterHistory.java (96%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableAlterHistoryRecord.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableAnalyzer.java (90%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableCodeGenerator.java (71%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableCodeGeneratorBase.java (81%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableDataHandler.java (81%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableFactory.java (87%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableSetting.java (86%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableType.java (89%) rename lealone-db/src/main/java/{org => com}/lealone/db/table/TableView.java (93%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/Csv.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/HashBase.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/IntArray.java (97%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/IntIntHashMap.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/SourceCompiler.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/SynchronizedVerifier.java (98%) rename lealone-db/src/main/java/{org => com}/lealone/db/util/ValueHashMap.java (96%) create mode 100644 lealone-db/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory delete mode 100644 lealone-db/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory rename lealone-db/src/main/resources/{org => com}/lealone/common/resources/help.csv (99%) rename lealone-main/src/main/java/{org => com}/lealone/main/Lealone.java (92%) rename lealone-main/src/main/java/{org => com}/lealone/main/Shell.java (86%) rename lealone-main/src/main/java/{org => com}/lealone/main/config/Config.java (97%) rename lealone-main/src/main/java/{org => com}/lealone/main/config/ConfigLoader.java (84%) rename lealone-main/src/main/java/{org => com}/lealone/main/config/YamlConfigLoader.java (93%) rename lealone-main/src/main/java/{org => com}/lealone/main/config/YamlConstructor.java (98%) rename lealone-net/src/main/java/{org => com}/lealone/net/AsyncConnection.java (94%) rename lealone-net/src/main/java/{org => com}/lealone/net/AsyncConnectionManager.java (87%) rename lealone-net/src/main/java/{org => com}/lealone/net/AsyncConnectionPool.java (95%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetBuffer.java (96%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetBufferFactory.java (75%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetBufferInputStream.java (97%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetBufferOutputStream.java (96%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetClient.java (88%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetClientBase.java (94%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetEventLoop.java (91%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetFactory.java (88%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetFactoryBase.java (81%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetFactoryManager.java (87%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetScheduler.java (88%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetServer.java (79%) rename lealone-net/src/main/java/{org => com}/lealone/net/NetServerBase.java (89%) rename lealone-net/src/main/java/{org => com}/lealone/net/TcpClientConnection.java (94%) rename lealone-net/src/main/java/{org => com}/lealone/net/TransferConnection.java (92%) rename lealone-net/src/main/java/{org => com}/lealone/net/TransferInputStream.java (89%) rename lealone-net/src/main/java/{org => com}/lealone/net/TransferOutputStream.java (95%) rename lealone-net/src/main/java/{org => com}/lealone/net/WritableChannel.java (96%) rename lealone-net/src/main/java/{org => com}/lealone/net/bio/BioNetClient.java (80%) rename lealone-net/src/main/java/{org => com}/lealone/net/bio/BioNetFactory.java (77%) rename lealone-net/src/main/java/{org => com}/lealone/net/bio/BioWritableChannel.java (90%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioAttachment.java (71%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioBuffer.java (95%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioBufferFactory.java (82%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioClient.java (84%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioEventLoop.java (96%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioNetFactory.java (81%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioServerAccepter.java (90%) rename lealone-net/src/main/java/{org => com}/lealone/net/nio/NioWritableChannel.java (90%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/BsonBase.java (87%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/BCAggregate.java (94%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/BCDelete.java (82%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/BCFind.java (87%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/BCInsert.java (86%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/BCUpdate.java (80%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/BsonCommand.java (90%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/admin/ACCreate.java (87%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/admin/ACDrop.java (78%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/admin/AdminCommand.java (85%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/auth/AuthCommand.java (89%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java (98%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java (97%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java (85%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java (86%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java (82%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/index/ICListIndexes.java (85%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/index/IndexCommand.java (77%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/legacy/LCDelete.java (85%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/legacy/LCInsert.java (85%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/legacy/LCQuery.java (87%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java (86%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java (62%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/role/RoleCommand.java (93%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java (89%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/command/user/UserCommand.java (93%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java (96%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/operator/BOQueryOperator.java (92%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java (88%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/bson/operator/BsonOperator.java (80%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/server/MongoServer.java (83%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/server/MongoServerConnection.java (89%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/server/MongoServerEngine.java (75%) rename lealone-plugins/mongo/src/main/java/{org => com}/lealone/plugins/mongo/server/MongoTask.java (80%) create mode 100644 lealone-plugins/mongo/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine delete mode 100644 lealone-plugins/mongo/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/MySQLServer.java (86%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/MySQLServerConnection.java (85%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/MySQLServerEngine.java (75%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/handler/AuthPacketHandler.java (68%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/handler/CommandPacketHandler.java (81%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/handler/PacketHandler.java (63%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/AuthPacket.java (95%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/EOFPacket.java (97%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/ErrorCode.java (99%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/ErrorPacket.java (97%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/ExecutePacket.java (89%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/FieldPacket.java (98%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/Fields.java (96%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/HandshakePacket.java (91%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/InitDbPacket.java (89%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/OkPacket.java (97%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/Packet.java (95%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/PacketInput.java (96%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/PacketOutput.java (96%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/PacketType.java (98%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java (97%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/RequestPacket.java (86%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/ResponsePacket.java (93%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java (97%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/protocol/RowDataPacket.java (98%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/util/Capabilities.java (98%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/util/CharsetUtil.java (99%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/util/RandomUtil.java (98%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/server/util/SecurityUtil.java (97%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/MySQLEngine.java (69%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/MySQLParser.java (95%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/ddl/CreateFunction.java (79%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/ddl/CreateProcedure.java (80%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/ddl/CreateRoutine.java (75%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/MySQLVariable.java (90%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/function/BitFunction.java (80%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/function/InformationFunction.java (78%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java (81%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java (76%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java (89%) rename lealone-plugins/mysql/src/main/java/{org => com}/lealone/plugins/mysql/sql/expression/function/UserFunction.java (70%) create mode 100644 lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine create mode 100644 lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine delete mode 100644 lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine delete mode 100644 lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/PgServer.java (86%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/PgServerConnection.java (85%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/PgServerEngine.java (74%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/PgTask.java (77%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/PgType.java (97%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java (96%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java (95%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/handler/PacketHandler.java (88%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/io/NetBufferInput.java (94%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/server/io/NetBufferOutput.java (93%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/PgAlias.java (97%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/PgSQLEngine.java (72%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/PgSQLParser.java (94%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/expression/PgVariable.java (67%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/expression/function/PgFunction.java (76%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java (70%) rename lealone-plugins/postgresql/src/main/java/{org => com}/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java (77%) create mode 100644 lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine create mode 100644 lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine delete mode 100644 lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine delete mode 100644 lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine rename lealone-plugins/postgresql/src/main/resources/{org => com}/lealone/plugins/postgresql/resources/pg_catalog.sql (92%) rename lealone-sci/src/main/java/{org => com}/lealone/db/lock/Lock.java (95%) rename lealone-sci/src/main/java/{org => com}/lealone/db/lock/LockOwner.java (85%) rename lealone-sci/src/main/java/{org => com}/lealone/db/lock/NullLockOwner.java (85%) rename lealone-sci/src/main/java/{org => com}/lealone/db/lock/SimpleLockOwner.java (86%) rename lealone-server/src/main/java/{org => com}/lealone/server/AsyncServer.java (89%) rename lealone-server/src/main/java/{org => com}/lealone/server/AsyncServerConnection.java (73%) rename lealone-server/src/main/java/{org => com}/lealone/server/AsyncServerManager.java (97%) rename lealone-server/src/main/java/{org => com}/lealone/server/TcpServer.java (81%) rename lealone-server/src/main/java/{org => com}/lealone/server/TcpServerConnection.java (90%) rename lealone-server/src/main/java/{org => com}/lealone/server/TcpServerEngine.java (93%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/BatchStatementPacketHandlers.java (87%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/LobPacketHandlers.java (86%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/PacketHandler.java (68%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/PacketHandlers.java (88%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/PreparedStatementPacketHandlers.java (78%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/ResultPacketHandlers.java (77%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/SessionPacketHandlers.java (77%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/StatementListPacketHandlers.java (91%) rename lealone-server/src/main/java/{org => com}/lealone/server/handler/StatementPacketHandlers.java (73%) rename lealone-server/src/main/java/{org => com}/lealone/server/scheduler/GlobalScheduler.java (94%) rename lealone-server/src/main/java/{org => com}/lealone/server/scheduler/LinkableTask.java (65%) rename lealone-server/src/main/java/{org => com}/lealone/server/scheduler/PacketHandleTask.java (80%) rename lealone-server/src/main/java/{org => com}/lealone/server/scheduler/SessionInfo.java (90%) rename lealone-server/src/main/java/{org => com}/lealone/server/scheduler/SessionInitTask.java (84%) rename lealone-server/src/main/java/{org => com}/lealone/server/scheduler/SessionValidator.java (94%) create mode 100644 lealone-server/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine delete mode 100644 lealone-server/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine rename lealone-sql/src/main/java/{org => com}/lealone/sql/LealoneSQLEngine.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/LealoneSQLParser.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/SQLEngineBase.java (69%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/SQLParserBase.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/StatementBase.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/StatementList.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/AdminStatement.java (75%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/CreatePlugin.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/DropPlugin.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/ShutdownDatabase.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/ShutdownPlugin.java (77%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/ShutdownServer.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/StartPlugin.java (77%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/admin/StartServer.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterDatabase.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterIndexRename.java (77%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterSchemaRename.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterSequence.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterTableAddConstraint.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterTableAlterColumn.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterTableDropConstraint.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterTableRename.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterTableRenameColumn.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterTableSet.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterUser.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AlterView.java (75%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/Analyze.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/AuthStatement.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateAggregate.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateConstant.java (81%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateDatabase.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateFunctionAlias.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateIndex.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateRole.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateSchema.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateSequence.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateService.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateTable.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateTrigger.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateUser.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateUserDataType.java (81%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/CreateView.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DatabaseStatement.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DeallocateProcedure.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DefinitionStatement.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropAggregate.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropConstant.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropDatabase.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropFunctionAlias.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropIndex.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropRole.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropSchema.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropSequence.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropService.java (77%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropTable.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropTrigger.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropUser.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropUserDataType.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/DropView.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/GrantRevoke.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/PrepareProcedure.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/RepairTable.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/SchemaStatement.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/SetComment.java (90%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/TruncateTable.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/ddl/UserStatement.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Backup.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Call.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Delete.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/ExecuteProcedure.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/ExecuteService.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/ExecuteStatement.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Explain.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/GenScript.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Insert.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/ManipulationStatement.java (71%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/MerSert.java (90%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Merge.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/NoOperation.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/RunScript.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/ScriptBase.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/SetDatabase.java (95%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/SetSession.java (90%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/SetStatement.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/TransactionStatement.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/UpDel.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/dml/Update.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/executor/YieldableBase.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/executor/YieldableLocalUpdate.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/executor/YieldableLoopUpdateBase.java (90%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/executor/YieldableUpdateBase.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Alias.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Expression.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/ExpressionColumn.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/ExpressionList.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Operation.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Parameter.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Rownum.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/SelectOrderBy.java (97%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/SequenceValue.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/ValueExpression.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Variable.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/Wildcard.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/ACount.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/ACountAll.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/ADefault.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/AGroupConcat.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/AHistogram.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/ASelectivity.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/Aggregate.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/AggregateData.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/BuiltInAggregate.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/aggregate/JavaAggregate.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/CompareLike.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/Comparison.java (95%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/Condition.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/ConditionAndOr.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/ConditionExists.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/ConditionIn.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/ConditionInConstantSet.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/ConditionInSelect.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/condition/ConditionNot.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/evaluator/ExpressionEvaluator.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/evaluator/ExpressionInterpreter.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/BuiltInFunction.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/BuiltInFunctionExt.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/BuiltInFunctionFactory.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/DateTimeFunction.java (95%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/Function.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/FunctionFactory.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/FunctionIndex.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/FunctionInfo.java (95%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/FunctionTable.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/JavaFunction.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/NumericFunction.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/StringFunction.java (97%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/SystemFunction.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/function/TableFunction.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/subquery/SubQuery.java (85%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/subquery/SubQueryResult.java (86%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/subquery/SubQueryRowList.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/BooleanExpressionVisitor.java (77%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/ColumnsVisitor.java (78%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/DependenciesVisitor.java (79%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/DeterministicVisitor.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/EvaluatableVisitor.java (81%) create mode 100644 lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitor.java rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/ExpressionVisitorBase.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/ExpressionVisitorFactory.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/IndependentVisitor.java (72%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/MapColumnsVisitor.java (81%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/MaxModificationIdVisitor.java (84%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/NotFromResolverVisitor.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/OptimizableVisitor.java (70%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/QueryComparableVisitor.java (73%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/UpdateAggregateVisitor.java (73%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/expression/visitor/VoidExpressionVisitor.java (76%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/operator/Operator.java (82%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/operator/OperatorFactory.java (70%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/operator/OperatorFactoryBase.java (80%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/AliasColumnResolver.java (81%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/ColumnResolver.java (87%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/ColumnResolverBase.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/IndexCondition.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/IndexCursor.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/Optimizer.java (97%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/Permutations.java (98%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/Plan.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/PlanItem.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/SingleColumnResolver.java (83%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/TableFilter.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/optimizer/TableIterator.java (90%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QAggregate.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QAggregateQuick.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QCache.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QDistinct.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QEmpty.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QFlat.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QGroup.java (94%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QGroupSorted.java (96%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QOperator.java (89%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/Query.java (91%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/QueryResultCache.java (92%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/Select.java (95%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/SelectUnion.java (88%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/YieldableLocalQuery.java (74%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/YieldableQueryBase.java (69%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/YieldableSelect.java (93%) rename lealone-sql/src/main/java/{org => com}/lealone/sql/query/YieldableSelectUnion.java (94%) delete mode 100644 lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitor.java create mode 100644 lealone-sql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine delete mode 100644 lealone-sql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine rename lealone-test/src/test/java/{org => com}/lealone/test/LealoneStart.java (89%) rename lealone-test/src/test/java/{org => com}/lealone/test/TestBase.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/UnitTestBase.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/AOStorageEngineTest.java (74%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/AOStorageTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/AoseTestBase.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/BTreeGCTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/BTreeMapTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/BTreeStorageTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/CompactTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/ConcurrentStorageMapTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/FlushDirtyPageTest.java (99%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/LobStorageTest.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/MemoryStorageTest.java (80%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/PageOperationTest.java (99%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/PageStorageModeSqlTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/PageStorageModeTest.java (82%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/PageUtilsTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/aose/StorageSqlTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/AoteTestBase.java (89%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/ConcurrentTransactionTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/IsolationLevelTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/TransactionCommitTest.java (83%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/TransactionEngineTest.java (88%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/TransactionMapTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/TransactionTest.java (89%) rename lealone-test/src/test/java/{org => com}/lealone/test/aote/TransactionalValueTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/AsyncConcurrentUpdateTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/BatchTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/ClientTestBase.java (80%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcArrayTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcBlobTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcCallableStatementTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcClobEmbedTest.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcClobTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcConnectionTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcDatabaseMetaDataTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcDriverTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcPreparedStatementTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/JdbcStatementTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/LealoneClientTest.java (88%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/SharedConnectionTest.java (77%) rename lealone-test/src/test/java/{org => com}/lealone/test/client/TraceTest.java (89%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/CommentTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/ConnectionInfoTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/DatabaseTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/DbObjectTestBase.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/DbTestBase.java (66%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/ServerSessionFactoryTest.java (80%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/SessionTest.java (84%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/auth/RightTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/auth/RoleTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/auth/UserTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/constraint/ConstraintCheckTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/constraint/ConstraintReferentialTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/constraint/ConstraintTestBase.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/constraint/ConstraintUniqueTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/index/IndexRebuildTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/index/IndexTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/index/IndexTestBase.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/index/NonUniqueHashIndexTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/index/UniqueHashIndexTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/ConstantTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/FunctionAliasTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/SchemaTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/SequenceTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/TriggerObjectTest.java (85%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/UserAggregateTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/schema/UserDataTypeTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/table/FunctionTableTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/table/MetaTableTest.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/table/RangeTableTest.java (83%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/table/TableTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/db/table/ViewTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/fs/FileEncryptTest.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/fs/FilePathTest.java (86%) rename lealone-test/src/test/java/{org => com}/lealone/test/fs/FileStorageTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/fs/FsTestBase.java (76%) rename lealone-test/src/test/java/{org => com}/lealone/test/main/LealoneTest.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/main/ShellTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/CRUDExample.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/DeleteTestData.java (83%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/EmbeddedExample.java (85%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/ExclusiveModeTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/JavaObjectSizeTest.java (66%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/MemDiskTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/QueryStatisticsTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/SchedulerYieldBugTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/SourceCompilerTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/misc/WrongPasswordTest.java (88%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/PluginManagerTest.java (84%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/PluginTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonAdminCommandTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonAggregateTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonFilterTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonIndexTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonTypeTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/MongoArrayTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/MongoCrudTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/MongoIdTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/MongoTestBase.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mongo/MqlTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/CatalogStatementTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/MySQLJdbcTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/MySQLShowStatementTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/MySQLSyntaxTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/MySQLTestBase.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/mysql/PasswordTest.java (75%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/postgresql/PgJdbcTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/postgresql/PgSyntaxTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/plugins/postgresql/PgTestBase.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/SqlTestBase.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/admin/ShutdownDatabaseTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/admin/ShutdownServerTest.java (81%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/ddl/AlterUserTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/ddl/DatabaseStatementTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/ddl/TruncateTableTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/BackupTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/CallTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/DeleteTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/ExecuteProcedureTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/ExplainTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/InsertTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/MergeTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/ScriptTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/SequenceLockedExceptionTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/SetTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/TransactionStatementTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/dml/UpdateTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/CompareLikeTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ConditionExistsTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ConditionInConstantSetTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ConditionInSelectTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ConditionInTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ExpressionColumnTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ExpressionListTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/ExpressionTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/RownumTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/SubQueryTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/VariableTest.java (88%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/expression/WildcardTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/AggregateFunctionTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/DateTimeFunctionTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/JavaFunctionTest.java (87%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/NumericFunctionTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/StringFunctionTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/SystemFunctionTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/function/TableFunctionTest.java (89%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/index/AsyncIndexTest.java (93%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/index/DelegateIndexTest.java (89%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/index/IndexTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/index/MainIndexColumnTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/index/UniqueIndexTest.java (90%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/lock/DbObjectLockTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/lock/DeadlockTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/lock/JdkReadWriteLockTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/lock/RowLockTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/lock/TableLockTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/onlineddl/OnlineDDLTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/priority/StatementPriorityTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/DistinctQueryTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/JoinTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/PseudoColumnTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/QuickAggregateQueryTest.java (96%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/SelectTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/SelectUnionTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/query/ShowStatementTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/service/ServiceTest.java (91%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/transaction/CommitTest.java (86%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/transaction/ReaCommittedTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/transaction/RepeatableReadTest.java (97%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/transaction/TransactionTest.java (98%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/transaction/TransactionalDDLTest.java (92%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/transaction/UpdateLossTest.java (95%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/type/CollectionTypeTest.java (94%) rename lealone-test/src/test/java/{org => com}/lealone/test/sql/type/EnumTypeTest.java (93%) diff --git a/lealone-aose/pom.xml b/lealone-aose/pom.xml index 16ae949f4..313a8b339 100644 --- a/lealone-aose/pom.xml +++ b/lealone-aose/pom.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.lealone + com.lealone lealone 6.0.0-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ - org.lealone + com.lealone lealone-common ${project.version} diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/AOStorage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/AOStorage.java similarity index 86% rename from lealone-aose/src/main/java/org/lealone/storage/aose/AOStorage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/AOStorage.java index bab58c943..62cd99977 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/AOStorage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/AOStorage.java @@ -3,22 +3,22 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose; +package com.lealone.storage.aose; import java.io.InputStream; import java.util.Map; -import org.lealone.common.util.CaseInsensitiveMap; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DbSetting; -import org.lealone.storage.StorageBase; -import org.lealone.storage.StorageEventListener; -import org.lealone.storage.StorageMap; -import org.lealone.storage.StorageSetting; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.fs.FilePath; -import org.lealone.storage.fs.FileUtils; -import org.lealone.storage.type.StorageDataType; +import com.lealone.common.util.CaseInsensitiveMap; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DbSetting; +import com.lealone.storage.StorageBase; +import com.lealone.storage.StorageEventListener; +import com.lealone.storage.StorageMap; +import com.lealone.storage.StorageSetting; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.fs.FilePath; +import com.lealone.storage.fs.FileUtils; +import com.lealone.storage.type.StorageDataType; /** * Adaptive optimization storage diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/AOStorageBuilder.java b/lealone-aose/src/main/java/com/lealone/storage/aose/AOStorageBuilder.java similarity index 87% rename from lealone-aose/src/main/java/org/lealone/storage/aose/AOStorageBuilder.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/AOStorageBuilder.java index 2c7ac2374..ebfbd2d46 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/AOStorageBuilder.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/AOStorageBuilder.java @@ -3,16 +3,16 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose; +package com.lealone.storage.aose; import java.util.HashMap; import java.util.Map; -import org.lealone.common.util.CaseInsensitiveMap; -import org.lealone.db.scheduler.EmbeddedScheduler; -import org.lealone.db.scheduler.SchedulerFactory; -import org.lealone.storage.StorageBuilder; -import org.lealone.storage.StorageSetting; +import com.lealone.common.util.CaseInsensitiveMap; +import com.lealone.db.scheduler.EmbeddedScheduler; +import com.lealone.db.scheduler.SchedulerFactory; +import com.lealone.storage.StorageBuilder; +import com.lealone.storage.StorageSetting; public class AOStorageBuilder extends StorageBuilder { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/AOStorageEngine.java b/lealone-aose/src/main/java/com/lealone/storage/aose/AOStorageEngine.java similarity index 66% rename from lealone-aose/src/main/java/org/lealone/storage/aose/AOStorageEngine.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/AOStorageEngine.java index f7ba39ef1..3fb83b0d2 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/AOStorageEngine.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/AOStorageEngine.java @@ -3,14 +3,14 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose; +package com.lealone.storage.aose; -import org.lealone.db.DataHandler; -import org.lealone.storage.Storage; -import org.lealone.storage.StorageBuilder; -import org.lealone.storage.StorageEngineBase; -import org.lealone.storage.aose.lob.LobStreamStorage; -import org.lealone.storage.lob.LobStorage; +import com.lealone.db.DataHandler; +import com.lealone.storage.Storage; +import com.lealone.storage.StorageBuilder; +import com.lealone.storage.StorageEngineBase; +import com.lealone.storage.aose.lob.LobStreamStorage; +import com.lealone.storage.lob.LobStorage; public class AOStorageEngine extends StorageEngineBase { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeCursor.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeCursor.java similarity index 93% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeCursor.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeCursor.java index 71da98d51..15119f082 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeCursor.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeCursor.java @@ -3,12 +3,12 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree; +package com.lealone.storage.aose.btree; -import org.lealone.storage.CursorParameters; -import org.lealone.storage.StorageMapCursor; -import org.lealone.storage.aose.btree.page.Page; -import org.lealone.storage.page.IPage; +import com.lealone.storage.CursorParameters; +import com.lealone.storage.StorageMapCursor; +import com.lealone.storage.aose.btree.page.Page; +import com.lealone.storage.page.IPage; /** * A cursor to iterate over elements in ascending order. diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeGC.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeGC.java similarity index 96% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeGC.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeGC.java index 1c9fc1f3b..108635045 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeGC.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeGC.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree; +package com.lealone.storage.aose.btree; import java.util.ArrayList; import java.util.Collections; @@ -11,12 +11,12 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import org.lealone.common.util.SystemPropertyUtils; -import org.lealone.db.MemoryManager; -import org.lealone.storage.aose.btree.page.Page; -import org.lealone.storage.aose.btree.page.PageInfo; -import org.lealone.storage.aose.btree.page.PageReference; -import org.lealone.transaction.TransactionEngine; +import com.lealone.common.util.SystemPropertyUtils; +import com.lealone.db.MemoryManager; +import com.lealone.storage.aose.btree.page.Page; +import com.lealone.storage.aose.btree.page.PageInfo; +import com.lealone.storage.aose.btree.page.PageReference; +import com.lealone.transaction.TransactionEngine; public class BTreeGC { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeMap.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeMap.java similarity index 92% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeMap.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeMap.java index e50947b2a..d0f666d91 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeMap.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeMap.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree; +package com.lealone.storage.aose.btree; import java.io.InputStream; import java.util.HashSet; @@ -11,38 +11,38 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantLock; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DbSetting; -import org.lealone.db.async.AsyncHandler; -import org.lealone.db.async.AsyncResult; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.scheduler.SchedulerFactory; -import org.lealone.db.scheduler.SchedulerListener; -import org.lealone.db.scheduler.SchedulerThread; -import org.lealone.db.session.Session; -import org.lealone.storage.CursorParameters; -import org.lealone.storage.StorageMapBase; -import org.lealone.storage.StorageMapCursor; -import org.lealone.storage.StorageSetting; -import org.lealone.storage.aose.AOStorage; -import org.lealone.storage.aose.btree.chunk.Chunk; -import org.lealone.storage.aose.btree.chunk.ChunkManager; -import org.lealone.storage.aose.btree.page.LeafPage; -import org.lealone.storage.aose.btree.page.Page; -import org.lealone.storage.aose.btree.page.PageOperations.Append; -import org.lealone.storage.aose.btree.page.PageOperations.Put; -import org.lealone.storage.aose.btree.page.PageOperations.PutIfAbsent; -import org.lealone.storage.aose.btree.page.PageOperations.Remove; -import org.lealone.storage.aose.btree.page.PageOperations.Replace; -import org.lealone.storage.aose.btree.page.PageOperations.WriteOperation; -import org.lealone.storage.aose.btree.page.PageReference; -import org.lealone.storage.aose.btree.page.PageStorageMode; -import org.lealone.storage.aose.btree.page.PageUtils; -import org.lealone.storage.aose.btree.page.PrettyPagePrinter; -import org.lealone.storage.fs.FilePath; -import org.lealone.storage.page.PageOperation.PageOperationResult; -import org.lealone.storage.type.StorageDataType; -import org.lealone.transaction.TransactionEngine; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DbSetting; +import com.lealone.db.async.AsyncHandler; +import com.lealone.db.async.AsyncResult; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.scheduler.SchedulerFactory; +import com.lealone.db.scheduler.SchedulerListener; +import com.lealone.db.scheduler.SchedulerThread; +import com.lealone.db.session.Session; +import com.lealone.storage.CursorParameters; +import com.lealone.storage.StorageMapBase; +import com.lealone.storage.StorageMapCursor; +import com.lealone.storage.StorageSetting; +import com.lealone.storage.aose.AOStorage; +import com.lealone.storage.aose.btree.chunk.Chunk; +import com.lealone.storage.aose.btree.chunk.ChunkManager; +import com.lealone.storage.aose.btree.page.LeafPage; +import com.lealone.storage.aose.btree.page.Page; +import com.lealone.storage.aose.btree.page.PageReference; +import com.lealone.storage.aose.btree.page.PageStorageMode; +import com.lealone.storage.aose.btree.page.PageUtils; +import com.lealone.storage.aose.btree.page.PrettyPagePrinter; +import com.lealone.storage.aose.btree.page.PageOperations.Append; +import com.lealone.storage.aose.btree.page.PageOperations.Put; +import com.lealone.storage.aose.btree.page.PageOperations.PutIfAbsent; +import com.lealone.storage.aose.btree.page.PageOperations.Remove; +import com.lealone.storage.aose.btree.page.PageOperations.Replace; +import com.lealone.storage.aose.btree.page.PageOperations.WriteOperation; +import com.lealone.storage.fs.FilePath; +import com.lealone.storage.page.PageOperation.PageOperationResult; +import com.lealone.storage.type.StorageDataType; +import com.lealone.transaction.TransactionEngine; /** * 支持同步和异步风格的BTree. diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeStorage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeStorage.java similarity index 92% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeStorage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeStorage.java index cfac95c4d..76c056ccd 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/BTreeStorage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/BTreeStorage.java @@ -3,32 +3,32 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree; +package com.lealone.storage.aose.btree; import java.io.File; import java.io.InputStream; import java.nio.ByteBuffer; -import org.lealone.common.compress.CompressDeflate; -import org.lealone.common.compress.CompressLZF; -import org.lealone.common.compress.Compressor; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.DataUtils; -import org.lealone.db.Constants; -import org.lealone.db.DataBuffer; -import org.lealone.db.DbSetting; -import org.lealone.db.scheduler.SchedulerFactory; -import org.lealone.storage.StorageSetting; -import org.lealone.storage.aose.btree.chunk.Chunk; -import org.lealone.storage.aose.btree.chunk.ChunkCompactor; -import org.lealone.storage.aose.btree.chunk.ChunkManager; -import org.lealone.storage.aose.btree.page.Page; -import org.lealone.storage.aose.btree.page.PageInfo; -import org.lealone.storage.aose.btree.page.PageUtils; -import org.lealone.storage.fs.FilePath; -import org.lealone.storage.fs.FileStorage; -import org.lealone.storage.fs.FileUtils; -import org.lealone.transaction.TransactionEngine; +import com.lealone.common.compress.CompressDeflate; +import com.lealone.common.compress.CompressLZF; +import com.lealone.common.compress.Compressor; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.DataUtils; +import com.lealone.db.Constants; +import com.lealone.db.DataBuffer; +import com.lealone.db.DbSetting; +import com.lealone.db.scheduler.SchedulerFactory; +import com.lealone.storage.StorageSetting; +import com.lealone.storage.aose.btree.chunk.Chunk; +import com.lealone.storage.aose.btree.chunk.ChunkCompactor; +import com.lealone.storage.aose.btree.chunk.ChunkManager; +import com.lealone.storage.aose.btree.page.Page; +import com.lealone.storage.aose.btree.page.PageInfo; +import com.lealone.storage.aose.btree.page.PageUtils; +import com.lealone.storage.fs.FilePath; +import com.lealone.storage.fs.FileStorage; +import com.lealone.storage.fs.FileUtils; +import com.lealone.transaction.TransactionEngine; /** * A persistent storage for btree map. diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/Chunk.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/Chunk.java similarity index 96% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/Chunk.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/Chunk.java index 4ac714950..f44546f55 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/Chunk.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/Chunk.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.chunk; +package com.lealone.storage.aose.btree.chunk; import java.nio.ByteBuffer; import java.util.HashMap; @@ -11,13 +11,13 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import org.lealone.common.util.DataUtils; -import org.lealone.common.util.MathUtils; -import org.lealone.db.DataBuffer; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.scheduler.SchedulerThread; -import org.lealone.storage.aose.btree.BTreeStorage; -import org.lealone.storage.fs.FileStorage; +import com.lealone.common.util.DataUtils; +import com.lealone.common.util.MathUtils; +import com.lealone.db.DataBuffer; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.scheduler.SchedulerThread; +import com.lealone.storage.aose.btree.BTreeStorage; +import com.lealone.storage.fs.FileStorage; /** * A chunk of data, containing one or multiple pages. diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/ChunkCompactor.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/ChunkCompactor.java similarity index 95% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/ChunkCompactor.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/ChunkCompactor.java index 497f21893..0aa1a8045 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/ChunkCompactor.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/ChunkCompactor.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.chunk; +package com.lealone.storage.aose.btree.chunk; import java.util.ArrayList; import java.util.Collections; @@ -11,10 +11,10 @@ import java.util.List; import java.util.Map.Entry; -import org.lealone.common.exceptions.DbException; -import org.lealone.storage.aose.btree.BTreeStorage; -import org.lealone.storage.aose.btree.page.Page; -import org.lealone.storage.aose.btree.page.PageUtils; +import com.lealone.common.exceptions.DbException; +import com.lealone.storage.aose.btree.BTreeStorage; +import com.lealone.storage.aose.btree.page.Page; +import com.lealone.storage.aose.btree.page.PageUtils; /** * Try to increase the fill rate by re-writing partially full chunks. diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/ChunkManager.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/ChunkManager.java similarity index 94% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/ChunkManager.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/ChunkManager.java index 1511f47b7..b30d59725 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/chunk/ChunkManager.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/chunk/ChunkManager.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.chunk; +package com.lealone.storage.aose.btree.chunk; import java.io.File; import java.io.InputStream; @@ -14,13 +14,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.BitField; -import org.lealone.common.util.DataUtils; -import org.lealone.storage.aose.AOStorage; -import org.lealone.storage.aose.btree.BTreeStorage; -import org.lealone.storage.aose.btree.page.PageUtils; -import org.lealone.storage.fs.FilePath; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.BitField; +import com.lealone.common.util.DataUtils; +import com.lealone.storage.aose.AOStorage; +import com.lealone.storage.aose.btree.BTreeStorage; +import com.lealone.storage.aose.btree.page.PageUtils; +import com.lealone.storage.fs.FilePath; public class ChunkManager { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/ColumnPage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/ColumnPage.java similarity index 92% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/ColumnPage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/ColumnPage.java index 321273aff..983f62c5b 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/ColumnPage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/ColumnPage.java @@ -3,15 +3,15 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.lealone.db.DataBuffer; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.aose.btree.chunk.Chunk; -import org.lealone.storage.type.StorageDataType; +import com.lealone.db.DataBuffer; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.aose.btree.chunk.Chunk; +import com.lealone.storage.type.StorageDataType; public class ColumnPage extends Page { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/LeafPage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/LeafPage.java similarity index 97% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/LeafPage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/LeafPage.java index 7a6feeb15..8591b2827 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/LeafPage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/LeafPage.java @@ -3,15 +3,15 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; import java.nio.ByteBuffer; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DataBuffer; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.aose.btree.chunk.Chunk; -import org.lealone.storage.type.StorageDataType; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DataBuffer; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.aose.btree.chunk.Chunk; +import com.lealone.storage.type.StorageDataType; public class LeafPage extends LocalPage { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/LocalPage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/LocalPage.java similarity index 95% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/LocalPage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/LocalPage.java index 90ffb2b5c..a1a8d07c5 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/LocalPage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/LocalPage.java @@ -3,11 +3,11 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; -import org.lealone.common.util.DataUtils; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.type.StorageDataType; +import com.lealone.common.util.DataUtils; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.type.StorageDataType; public abstract class LocalPage extends Page { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/NodePage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/NodePage.java similarity index 96% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/NodePage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/NodePage.java index 9c09295cd..841da8ecc 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/NodePage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/NodePage.java @@ -3,16 +3,16 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; import java.nio.ByteBuffer; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DataBuffer; -import org.lealone.storage.aose.btree.BTreeGC; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.aose.btree.chunk.Chunk; -import org.lealone.storage.aose.btree.page.PageOperations.TmpNodePage; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DataBuffer; +import com.lealone.storage.aose.btree.BTreeGC; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.aose.btree.chunk.Chunk; +import com.lealone.storage.aose.btree.page.PageOperations.TmpNodePage; public class NodePage extends LocalPage { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/Page.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/Page.java similarity index 95% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/Page.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/Page.java index 716771bf9..763eb69a9 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/Page.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/Page.java @@ -3,19 +3,19 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; import java.nio.ByteBuffer; -import org.lealone.common.compress.Compressor; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DataBuffer; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.aose.btree.BTreeStorage; -import org.lealone.storage.aose.btree.chunk.Chunk; -import org.lealone.storage.aose.btree.page.PageOperations.TmpNodePage; -import org.lealone.storage.page.IPage; +import com.lealone.common.compress.Compressor; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DataBuffer; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.aose.btree.BTreeStorage; +import com.lealone.storage.aose.btree.chunk.Chunk; +import com.lealone.storage.aose.btree.page.PageOperations.TmpNodePage; +import com.lealone.storage.page.IPage; public class Page implements IPage { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageInfo.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageInfo.java similarity index 98% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageInfo.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageInfo.java index 5d1b35427..36abc1253 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageInfo.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageInfo.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; import java.nio.ByteBuffer; diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageOperations.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageOperations.java similarity index 97% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageOperations.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageOperations.java index 3026eb006..527ba682a 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageOperations.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageOperations.java @@ -3,17 +3,17 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; - -import org.lealone.db.async.AsyncHandler; -import org.lealone.db.async.AsyncResult; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.session.Session; -import org.lealone.db.value.ValueLong; -import org.lealone.storage.aose.btree.BTreeGC; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.page.PageOperation; -import org.lealone.storage.page.PageOperation.PageOperationResult; +package com.lealone.storage.aose.btree.page; + +import com.lealone.db.async.AsyncHandler; +import com.lealone.db.async.AsyncResult; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.session.Session; +import com.lealone.db.value.ValueLong; +import com.lealone.storage.aose.btree.BTreeGC; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.page.PageOperation; +import com.lealone.storage.page.PageOperation.PageOperationResult; public abstract class PageOperations { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageReference.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageReference.java similarity index 96% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageReference.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageReference.java index c51f7a56e..c890cbe32 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageReference.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageReference.java @@ -3,21 +3,21 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import org.lealone.common.exceptions.DbException; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.scheduler.SchedulerLock; -import org.lealone.db.scheduler.SchedulerThread; -import org.lealone.db.session.Session; -import org.lealone.storage.aose.btree.BTreeStorage; -import org.lealone.storage.aose.btree.page.PageInfo.SplittedPageInfo; -import org.lealone.storage.aose.btree.page.PageOperations.TmpNodePage; -import org.lealone.transaction.Transaction; -import org.lealone.transaction.TransactionEngine; +import com.lealone.common.exceptions.DbException; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.scheduler.SchedulerLock; +import com.lealone.db.scheduler.SchedulerThread; +import com.lealone.db.session.Session; +import com.lealone.storage.aose.btree.BTreeStorage; +import com.lealone.storage.aose.btree.page.PageInfo.SplittedPageInfo; +import com.lealone.storage.aose.btree.page.PageOperations.TmpNodePage; +import com.lealone.transaction.Transaction; +import com.lealone.transaction.TransactionEngine; public class PageReference { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageStorageMode.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageStorageMode.java similarity index 85% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageStorageMode.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageStorageMode.java index 93adebd94..3945fea4f 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageStorageMode.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageStorageMode.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; public enum PageStorageMode { // 定义的先后顺序不能随便改动，其他代码依赖 ordinal diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageUtils.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageUtils.java similarity index 98% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageUtils.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageUtils.java index c18bc3a4c..cb80aef10 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PageUtils.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PageUtils.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; public class PageUtils { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PrettyPagePrinter.java b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PrettyPagePrinter.java similarity index 98% rename from lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PrettyPagePrinter.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PrettyPagePrinter.java index f3075ae21..112d38d5f 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/btree/page/PrettyPagePrinter.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/btree/page/PrettyPagePrinter.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.storage.aose.btree.page; +package com.lealone.storage.aose.btree.page; // 打印出漂亮的由page组成的btree public class PrettyPagePrinter { diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/lob/LobStreamMap.java b/lealone-aose/src/main/java/com/lealone/storage/aose/lob/LobStreamMap.java similarity index 98% rename from lealone-aose/src/main/java/org/lealone/storage/aose/lob/LobStreamMap.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/lob/LobStreamMap.java index c32520dde..6922dcf72 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/lob/LobStreamMap.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/lob/LobStreamMap.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.storage.aose.lob; +package com.lealone.storage.aose.lob; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -13,9 +13,9 @@ import java.util.Arrays; import java.util.concurrent.atomic.AtomicReference; -import org.lealone.common.util.DataUtils; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.transaction.TransactionEngine; +import com.lealone.common.util.DataUtils; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.transaction.TransactionEngine; /** * A facility to store streams in a map. Streams are split into blocks, which diff --git a/lealone-aose/src/main/java/org/lealone/storage/aose/lob/LobStreamStorage.java b/lealone-aose/src/main/java/com/lealone/storage/aose/lob/LobStreamStorage.java similarity index 96% rename from lealone-aose/src/main/java/org/lealone/storage/aose/lob/LobStreamStorage.java rename to lealone-aose/src/main/java/com/lealone/storage/aose/lob/LobStreamStorage.java index dcef58b70..01840323c 100644 --- a/lealone-aose/src/main/java/org/lealone/storage/aose/lob/LobStreamStorage.java +++ b/lealone-aose/src/main/java/com/lealone/storage/aose/lob/LobStreamStorage.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.storage.aose.lob; +package com.lealone.storage.aose.lob; import java.io.FilterInputStream; import java.io.IOException; @@ -18,19 +18,19 @@ import java.util.Arrays; import java.util.zip.ZipOutputStream; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.IOUtils; -import org.lealone.db.Constants; -import org.lealone.db.DataHandler; -import org.lealone.db.value.Value; -import org.lealone.db.value.ValueLob; -import org.lealone.db.value.ValueLong; -import org.lealone.storage.Storage; -import org.lealone.storage.StorageMapCursor; -import org.lealone.storage.aose.AOStorage; -import org.lealone.storage.aose.btree.BTreeMap; -import org.lealone.storage.lob.LobStorage; -import org.lealone.transaction.TransactionEngine; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.IOUtils; +import com.lealone.db.Constants; +import com.lealone.db.DataHandler; +import com.lealone.db.value.Value; +import com.lealone.db.value.ValueLob; +import com.lealone.db.value.ValueLong; +import com.lealone.storage.Storage; +import com.lealone.storage.StorageMapCursor; +import com.lealone.storage.aose.AOStorage; +import com.lealone.storage.aose.btree.BTreeMap; +import com.lealone.storage.lob.LobStorage; +import com.lealone.transaction.TransactionEngine; /** * This class stores LOB objects in the database, in maps. diff --git a/lealone-aose/src/main/resources/META-INF/services/com.lealone.storage.StorageEngine b/lealone-aose/src/main/resources/META-INF/services/com.lealone.storage.StorageEngine new file mode 100644 index 000000000..5e611e140 --- /dev/null +++ b/lealone-aose/src/main/resources/META-INF/services/com.lealone.storage.StorageEngine @@ -0,0 +1 @@ +com.lealone.storage.aose.AOStorageEngine \ No newline at end of file diff --git a/lealone-aose/src/main/resources/META-INF/services/org.lealone.storage.StorageEngine b/lealone-aose/src/main/resources/META-INF/services/org.lealone.storage.StorageEngine deleted file mode 100644 index 30f56fdb0..000000000 --- a/lealone-aose/src/main/resources/META-INF/services/org.lealone.storage.StorageEngine +++ /dev/null @@ -1 +0,0 @@ -org.lealone.storage.aose.AOStorageEngine \ No newline at end of file diff --git a/lealone-aote/pom.xml b/lealone-aote/pom.xml index 801a4399a..0834247d7 100644 --- a/lealone-aote/pom.xml +++ b/lealone-aote/pom.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.lealone + com.lealone lealone 6.0.0-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ - org.lealone + com.lealone lealone-sci ${project.version} diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransaction.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransaction.java similarity index 91% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransaction.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransaction.java index 92b6d246d..24df3bf06 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransaction.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransaction.java @@ -3,37 +3,37 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote; +package com.lealone.transaction.aote; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DataBuffer; -import org.lealone.db.RunMode; -import org.lealone.db.api.ErrorCode; -import org.lealone.db.async.AsyncCallback; -import org.lealone.db.async.AsyncHandler; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.session.Session; -import org.lealone.db.session.SessionStatus; -import org.lealone.storage.Storage; -import org.lealone.storage.StorageMap; -import org.lealone.storage.StorageSetting; -import org.lealone.storage.type.ObjectDataType; -import org.lealone.storage.type.StorageDataType; -import org.lealone.transaction.Transaction; -import org.lealone.transaction.TransactionMap; -import org.lealone.transaction.aote.lock.RowLock; -import org.lealone.transaction.aote.log.LogSyncService; -import org.lealone.transaction.aote.log.RedoLogRecord; -import org.lealone.transaction.aote.log.RedoLogRecord.LazyLocalTransactionRLR; -import org.lealone.transaction.aote.log.RedoLogRecord.LobSave; -import org.lealone.transaction.aote.log.RedoLogRecord.LocalTransactionRLR; -import org.lealone.transaction.aote.log.UndoLog; -import org.lealone.transaction.aote.tm.TransactionManager; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DataBuffer; +import com.lealone.db.RunMode; +import com.lealone.db.api.ErrorCode; +import com.lealone.db.async.AsyncCallback; +import com.lealone.db.async.AsyncHandler; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.session.Session; +import com.lealone.db.session.SessionStatus; +import com.lealone.storage.Storage; +import com.lealone.storage.StorageMap; +import com.lealone.storage.StorageSetting; +import com.lealone.storage.type.ObjectDataType; +import com.lealone.storage.type.StorageDataType; +import com.lealone.transaction.Transaction; +import com.lealone.transaction.TransactionMap; +import com.lealone.transaction.aote.lock.RowLock; +import com.lealone.transaction.aote.log.LogSyncService; +import com.lealone.transaction.aote.log.RedoLogRecord; +import com.lealone.transaction.aote.log.UndoLog; +import com.lealone.transaction.aote.log.RedoLogRecord.LazyLocalTransactionRLR; +import com.lealone.transaction.aote.log.RedoLogRecord.LobSave; +import com.lealone.transaction.aote.log.RedoLogRecord.LocalTransactionRLR; +import com.lealone.transaction.aote.tm.TransactionManager; public class AOTransaction implements Transaction { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransactionEngine.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransactionEngine.java similarity index 92% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransactionEngine.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransactionEngine.java index 890496e8f..c9a74e716 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransactionEngine.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransactionEngine.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote; +package com.lealone.transaction.aote; import java.util.ArrayList; import java.util.Collections; @@ -14,20 +14,20 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.lealone.common.util.ShutdownHookUtils; -import org.lealone.db.RunMode; -import org.lealone.db.SysProperties; -import org.lealone.db.scheduler.EmbeddedScheduler; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.scheduler.SchedulerFactory; -import org.lealone.db.scheduler.SchedulerThread; -import org.lealone.storage.Storage; -import org.lealone.storage.StorageEventListener; -import org.lealone.storage.StorageMap; -import org.lealone.transaction.TransactionEngineBase; -import org.lealone.transaction.aote.log.LogSyncService; -import org.lealone.transaction.aote.log.RedoLogRecord; -import org.lealone.transaction.aote.tm.TransactionManager; +import com.lealone.common.util.ShutdownHookUtils; +import com.lealone.db.RunMode; +import com.lealone.db.SysProperties; +import com.lealone.db.scheduler.EmbeddedScheduler; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.scheduler.SchedulerFactory; +import com.lealone.db.scheduler.SchedulerThread; +import com.lealone.storage.Storage; +import com.lealone.storage.StorageEventListener; +import com.lealone.storage.StorageMap; +import com.lealone.transaction.TransactionEngineBase; +import com.lealone.transaction.aote.log.LogSyncService; +import com.lealone.transaction.aote.log.RedoLogRecord; +import com.lealone.transaction.aote.tm.TransactionManager; //Async adaptive Optimization Transaction Engine public class AOTransactionEngine extends TransactionEngineBase implements StorageEventListener { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransactionMap.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransactionMap.java similarity index 95% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransactionMap.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransactionMap.java index 382432ab1..0cc743d3a 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/AOTransactionMap.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/AOTransactionMap.java @@ -3,27 +3,27 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote; - -import org.lealone.common.util.DataUtils; -import org.lealone.db.async.AsyncCallback; -import org.lealone.db.async.AsyncHandler; -import org.lealone.db.async.AsyncResult; -import org.lealone.db.async.Future; -import org.lealone.db.scheduler.SchedulerListener; -import org.lealone.db.session.Session; -import org.lealone.storage.CursorParameters; -import org.lealone.storage.Storage; -import org.lealone.storage.StorageMap; -import org.lealone.storage.StorageMapCursor; -import org.lealone.storage.page.IPage; -import org.lealone.storage.type.StorageDataType; -import org.lealone.transaction.Transaction; -import org.lealone.transaction.TransactionEngine; -import org.lealone.transaction.TransactionMap; -import org.lealone.transaction.TransactionMapCursor; -import org.lealone.transaction.aote.log.UndoLog; -import org.lealone.transaction.aote.log.UndoLogRecord; +package com.lealone.transaction.aote; + +import com.lealone.common.util.DataUtils; +import com.lealone.db.async.AsyncCallback; +import com.lealone.db.async.AsyncHandler; +import com.lealone.db.async.AsyncResult; +import com.lealone.db.async.Future; +import com.lealone.db.scheduler.SchedulerListener; +import com.lealone.db.session.Session; +import com.lealone.storage.CursorParameters; +import com.lealone.storage.Storage; +import com.lealone.storage.StorageMap; +import com.lealone.storage.StorageMapCursor; +import com.lealone.storage.page.IPage; +import com.lealone.storage.type.StorageDataType; +import com.lealone.transaction.Transaction; +import com.lealone.transaction.TransactionEngine; +import com.lealone.transaction.TransactionMap; +import com.lealone.transaction.TransactionMapCursor; +import com.lealone.transaction.aote.log.UndoLog; +import com.lealone.transaction.aote.log.UndoLogRecord; public class AOTransactionMap implements TransactionMap { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/CheckpointService.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/CheckpointService.java similarity index 96% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/CheckpointService.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/CheckpointService.java index 9d7aa694f..e0f9d92b5 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/CheckpointService.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/CheckpointService.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote; +package com.lealone.transaction.aote; import java.lang.management.ManagementFactory; import java.lang.management.MemoryUsage; @@ -16,19 +16,19 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.lealone.common.logging.Logger; -import org.lealone.common.logging.LoggerFactory; -import org.lealone.common.util.MapUtils; -import org.lealone.db.MemoryManager; -import org.lealone.db.async.AsyncPeriodicTask; -import org.lealone.db.link.LinkableList; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.storage.StorageMap; -import org.lealone.storage.fs.FileStorage; -import org.lealone.transaction.TransactionEngine.GcTask; -import org.lealone.transaction.aote.TransactionalValue.OldValue; -import org.lealone.transaction.aote.log.RedoLogRecord; -import org.lealone.transaction.aote.log.RedoLogRecord.PendingCheckpoint; +import com.lealone.common.logging.Logger; +import com.lealone.common.logging.LoggerFactory; +import com.lealone.common.util.MapUtils; +import com.lealone.db.MemoryManager; +import com.lealone.db.async.AsyncPeriodicTask; +import com.lealone.db.link.LinkableList; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.storage.StorageMap; +import com.lealone.storage.fs.FileStorage; +import com.lealone.transaction.TransactionEngine.GcTask; +import com.lealone.transaction.aote.TransactionalValue.OldValue; +import com.lealone.transaction.aote.log.RedoLogRecord; +import com.lealone.transaction.aote.log.RedoLogRecord.PendingCheckpoint; public class CheckpointService implements MemoryManager.MemoryListener, Runnable { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/TransactionalValue.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/TransactionalValue.java similarity index 95% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/TransactionalValue.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/TransactionalValue.java index d4f0160ba..b90a27e04 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/TransactionalValue.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/TransactionalValue.java @@ -3,21 +3,21 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote; +package com.lealone.transaction.aote; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DataBuffer; -import org.lealone.storage.StorageMap; -import org.lealone.storage.type.StorageDataType; -import org.lealone.transaction.ITransactionalValue; -import org.lealone.transaction.Transaction; -import org.lealone.transaction.aote.lock.InsertRowLock; -import org.lealone.transaction.aote.lock.RowLock; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DataBuffer; +import com.lealone.storage.StorageMap; +import com.lealone.storage.type.StorageDataType; +import com.lealone.transaction.ITransactionalValue; +import com.lealone.transaction.Transaction; +import com.lealone.transaction.aote.lock.InsertRowLock; +import com.lealone.transaction.aote.lock.RowLock; //每个表的每一条记录都对应这个类的一个实例，所以不能随意在这个类中加新的字段 public class TransactionalValue implements ITransactionalValue { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/TransactionalValueType.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/TransactionalValueType.java similarity index 95% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/TransactionalValueType.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/TransactionalValueType.java index e2af90402..b3af744f3 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/TransactionalValueType.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/TransactionalValueType.java @@ -3,13 +3,13 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote; +package com.lealone.transaction.aote; import java.nio.ByteBuffer; -import org.lealone.db.DataBuffer; -import org.lealone.db.value.ValueArray; -import org.lealone.storage.type.StorageDataType; +import com.lealone.db.DataBuffer; +import com.lealone.db.value.ValueArray; +import com.lealone.storage.type.StorageDataType; public class TransactionalValueType implements StorageDataType { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/lock/InsertRowLock.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/lock/InsertRowLock.java similarity index 79% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/lock/InsertRowLock.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/lock/InsertRowLock.java index 33f775f63..1c985c10e 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/lock/InsertRowLock.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/lock/InsertRowLock.java @@ -3,10 +3,10 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.lock; +package com.lealone.transaction.aote.lock; -import org.lealone.db.session.Session; -import org.lealone.transaction.aote.TransactionalValue; +import com.lealone.db.session.Session; +import com.lealone.transaction.aote.TransactionalValue; public class InsertRowLock extends RowLock { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/lock/RowLock.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/lock/RowLock.java similarity index 77% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/lock/RowLock.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/lock/RowLock.java index 38a511c69..b91e27f7c 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/lock/RowLock.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/lock/RowLock.java @@ -3,13 +3,13 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.lock; +package com.lealone.transaction.aote.lock; -import org.lealone.db.lock.Lock; -import org.lealone.db.lock.LockOwner; -import org.lealone.db.session.Session; -import org.lealone.transaction.Transaction; -import org.lealone.transaction.aote.AOTransaction; +import com.lealone.db.lock.Lock; +import com.lealone.db.lock.LockOwner; +import com.lealone.db.session.Session; +import com.lealone.transaction.Transaction; +import com.lealone.transaction.aote.AOTransaction; public class RowLock extends Lock { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/lock/RowLockOwner.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/lock/RowLockOwner.java similarity index 76% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/lock/RowLockOwner.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/lock/RowLockOwner.java index 1c7ae385c..2d5363812 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/lock/RowLockOwner.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/lock/RowLockOwner.java @@ -3,10 +3,10 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.lock; +package com.lealone.transaction.aote.lock; -import org.lealone.db.lock.SimpleLockOwner; -import org.lealone.transaction.Transaction; +import com.lealone.db.lock.SimpleLockOwner; +import com.lealone.transaction.Transaction; public class RowLockOwner extends SimpleLockOwner { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/InstantLogSyncService.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/InstantLogSyncService.java similarity index 82% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/InstantLogSyncService.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/InstantLogSyncService.java index 6630c4c7f..05c2312f9 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/InstantLogSyncService.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/InstantLogSyncService.java @@ -3,11 +3,11 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.util.Map; -import org.lealone.common.util.MapUtils; +import com.lealone.common.util.MapUtils; class InstantLogSyncService extends LogSyncService { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/LogSyncService.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/LogSyncService.java similarity index 92% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/LogSyncService.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/LogSyncService.java index 1924e37c6..72f1bb115 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/LogSyncService.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/LogSyncService.java @@ -3,21 +3,21 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.logging.Logger; -import org.lealone.common.logging.LoggerFactory; -import org.lealone.common.util.Awaiter; -import org.lealone.common.util.MapUtils; -import org.lealone.db.RunMode; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.transaction.PendingTransaction; -import org.lealone.transaction.aote.AOTransaction; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.logging.Logger; +import com.lealone.common.logging.LoggerFactory; +import com.lealone.common.util.Awaiter; +import com.lealone.common.util.MapUtils; +import com.lealone.db.RunMode; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.transaction.PendingTransaction; +import com.lealone.transaction.aote.AOTransaction; public abstract class LogSyncService extends Thread { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/NoLogSyncService.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/NoLogSyncService.java similarity index 90% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/NoLogSyncService.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/NoLogSyncService.java index b4d3316e3..03922f42b 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/NoLogSyncService.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/NoLogSyncService.java @@ -3,11 +3,11 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.util.Map; -import org.lealone.transaction.aote.AOTransaction; +import com.lealone.transaction.aote.AOTransaction; class NoLogSyncService extends LogSyncService { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/PeriodicLogSyncService.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/PeriodicLogSyncService.java similarity index 91% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/PeriodicLogSyncService.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/PeriodicLogSyncService.java index 9d3281dbd..3fa543785 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/PeriodicLogSyncService.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/PeriodicLogSyncService.java @@ -3,13 +3,13 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.util.Map; -import org.lealone.common.util.MapUtils; -import org.lealone.transaction.PendingTransaction; -import org.lealone.transaction.aote.AOTransaction; +import com.lealone.common.util.MapUtils; +import com.lealone.transaction.PendingTransaction; +import com.lealone.transaction.aote.AOTransaction; class PeriodicLogSyncService extends LogSyncService { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLog.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLog.java similarity index 88% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLog.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLog.java index 158c2e286..cefdc2bc7 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLog.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLog.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.io.File; import java.nio.ByteBuffer; @@ -13,18 +13,18 @@ import java.util.List; import java.util.Map; -import org.lealone.common.util.MapUtils; -import org.lealone.db.async.AsyncHandler; -import org.lealone.db.async.AsyncResult; -import org.lealone.storage.StorageMap; -import org.lealone.storage.StorageSetting; -import org.lealone.storage.fs.FilePath; -import org.lealone.storage.fs.FileUtils; -import org.lealone.storage.type.StorageDataType; -import org.lealone.transaction.aote.CheckpointService; -import org.lealone.transaction.aote.CheckpointService.FsyncTask; -import org.lealone.transaction.aote.TransactionalValue; -import org.lealone.transaction.aote.TransactionalValueType; +import com.lealone.common.util.MapUtils; +import com.lealone.db.async.AsyncHandler; +import com.lealone.db.async.AsyncResult; +import com.lealone.storage.StorageMap; +import com.lealone.storage.StorageSetting; +import com.lealone.storage.fs.FilePath; +import com.lealone.storage.fs.FileUtils; +import com.lealone.storage.type.StorageDataType; +import com.lealone.transaction.aote.CheckpointService; +import com.lealone.transaction.aote.TransactionalValue; +import com.lealone.transaction.aote.TransactionalValueType; +import com.lealone.transaction.aote.CheckpointService.FsyncTask; public class RedoLog { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLogChunk.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLogChunk.java similarity index 94% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLogChunk.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLogChunk.java index 509f8f754..9d5a855cd 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLogChunk.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLogChunk.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.io.File; import java.nio.ByteBuffer; @@ -13,20 +13,20 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicLong; -import org.lealone.common.logging.Logger; -import org.lealone.common.logging.LoggerFactory; -import org.lealone.common.util.MapUtils; -import org.lealone.db.Constants; -import org.lealone.db.DataBuffer; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.storage.StorageSetting; -import org.lealone.storage.fs.FileStorage; -import org.lealone.storage.fs.FileUtils; -import org.lealone.transaction.PendingTransaction; -import org.lealone.transaction.aote.CheckpointService; -import org.lealone.transaction.aote.CheckpointService.FsyncTask; -import org.lealone.transaction.aote.log.RedoLogRecord.CheckpointRLR; -import org.lealone.transaction.aote.log.RedoLogRecord.PendingCheckpoint; +import com.lealone.common.logging.Logger; +import com.lealone.common.logging.LoggerFactory; +import com.lealone.common.util.MapUtils; +import com.lealone.db.Constants; +import com.lealone.db.DataBuffer; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.storage.StorageSetting; +import com.lealone.storage.fs.FileStorage; +import com.lealone.storage.fs.FileUtils; +import com.lealone.transaction.PendingTransaction; +import com.lealone.transaction.aote.CheckpointService; +import com.lealone.transaction.aote.CheckpointService.FsyncTask; +import com.lealone.transaction.aote.log.RedoLogRecord.CheckpointRLR; +import com.lealone.transaction.aote.log.RedoLogRecord.PendingCheckpoint; class RedoLogChunk { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLogRecord.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLogRecord.java similarity index 96% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLogRecord.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLogRecord.java index 9ffba63b2..3704659af 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/RedoLogRecord.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/RedoLogRecord.java @@ -3,19 +3,19 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; import java.nio.ByteBuffer; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.DataUtils; -import org.lealone.db.DataBuffer; -import org.lealone.db.link.LinkableBase; -import org.lealone.db.value.ValueString; -import org.lealone.transaction.aote.AOTransactionEngine; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.DataUtils; +import com.lealone.db.DataBuffer; +import com.lealone.db.link.LinkableBase; +import com.lealone.db.value.ValueString; +import com.lealone.transaction.aote.AOTransactionEngine; public abstract class RedoLogRecord { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/UndoLog.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/UndoLog.java similarity index 89% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/UndoLog.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/UndoLog.java index 9a0f4d1b3..1936b20a9 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/UndoLog.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/UndoLog.java @@ -3,13 +3,13 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; -import org.lealone.db.DataBuffer; -import org.lealone.db.DataBufferFactory; -import org.lealone.storage.StorageMap; -import org.lealone.transaction.aote.AOTransactionEngine; -import org.lealone.transaction.aote.TransactionalValue; +import com.lealone.db.DataBuffer; +import com.lealone.db.DataBufferFactory; +import com.lealone.storage.StorageMap; +import com.lealone.transaction.aote.AOTransactionEngine; +import com.lealone.transaction.aote.TransactionalValue; // 只有一个线程访问 public class UndoLog { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/UndoLogRecord.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/UndoLogRecord.java similarity index 90% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/log/UndoLogRecord.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/log/UndoLogRecord.java index d71eea26b..1b18cd75e 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/log/UndoLogRecord.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/log/UndoLogRecord.java @@ -3,14 +3,14 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.log; +package com.lealone.transaction.aote.log; -import org.lealone.db.DataBuffer; -import org.lealone.db.value.ValueString; -import org.lealone.storage.StorageMap; -import org.lealone.transaction.aote.AOTransactionEngine; -import org.lealone.transaction.aote.TransactionalValue; -import org.lealone.transaction.aote.TransactionalValueType; +import com.lealone.db.DataBuffer; +import com.lealone.db.value.ValueString; +import com.lealone.storage.StorageMap; +import com.lealone.transaction.aote.AOTransactionEngine; +import com.lealone.transaction.aote.TransactionalValue; +import com.lealone.transaction.aote.TransactionalValueType; public class UndoLogRecord { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/tm/ConcurrentTransactionManager.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/tm/ConcurrentTransactionManager.java similarity index 89% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/tm/ConcurrentTransactionManager.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/tm/ConcurrentTransactionManager.java index 1b0edb367..049702e56 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/tm/ConcurrentTransactionManager.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/tm/ConcurrentTransactionManager.java @@ -3,14 +3,14 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.tm; +package com.lealone.transaction.aote.tm; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.lealone.transaction.aote.AOTransaction; -import org.lealone.transaction.aote.AOTransactionEngine; +import com.lealone.transaction.aote.AOTransaction; +import com.lealone.transaction.aote.AOTransactionEngine; public class ConcurrentTransactionManager extends TransactionManager { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/tm/SingleThreadTransactionManager.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/tm/SingleThreadTransactionManager.java similarity index 90% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/tm/SingleThreadTransactionManager.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/tm/SingleThreadTransactionManager.java index e23632d01..702c157c3 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/tm/SingleThreadTransactionManager.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/tm/SingleThreadTransactionManager.java @@ -3,13 +3,13 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.tm; +package com.lealone.transaction.aote.tm; import java.util.List; -import org.lealone.common.util.BitField; -import org.lealone.transaction.aote.AOTransaction; -import org.lealone.transaction.aote.AOTransactionEngine; +import com.lealone.common.util.BitField; +import com.lealone.transaction.aote.AOTransaction; +import com.lealone.transaction.aote.AOTransactionEngine; public class SingleThreadTransactionManager extends TransactionManager { diff --git a/lealone-aote/src/main/java/org/lealone/transaction/aote/tm/TransactionManager.java b/lealone-aote/src/main/java/com/lealone/transaction/aote/tm/TransactionManager.java similarity index 86% rename from lealone-aote/src/main/java/org/lealone/transaction/aote/tm/TransactionManager.java rename to lealone-aote/src/main/java/com/lealone/transaction/aote/tm/TransactionManager.java index 46990be12..5e064eb63 100644 --- a/lealone-aote/src/main/java/org/lealone/transaction/aote/tm/TransactionManager.java +++ b/lealone-aote/src/main/java/com/lealone/transaction/aote/tm/TransactionManager.java @@ -3,12 +3,12 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.transaction.aote.tm; +package com.lealone.transaction.aote.tm; import java.util.List; -import org.lealone.transaction.aote.AOTransaction; -import org.lealone.transaction.aote.AOTransactionEngine; +import com.lealone.transaction.aote.AOTransaction; +import com.lealone.transaction.aote.AOTransactionEngine; public abstract class TransactionManager { diff --git a/lealone-aote/src/main/resources/META-INF/services/com.lealone.transaction.TransactionEngine b/lealone-aote/src/main/resources/META-INF/services/com.lealone.transaction.TransactionEngine new file mode 100644 index 000000000..af0b15817 --- /dev/null +++ b/lealone-aote/src/main/resources/META-INF/services/com.lealone.transaction.TransactionEngine @@ -0,0 +1 @@ +com.lealone.transaction.aote.AOTransactionEngine \ No newline at end of file diff --git a/lealone-aote/src/main/resources/META-INF/services/org.lealone.transaction.TransactionEngine b/lealone-aote/src/main/resources/META-INF/services/org.lealone.transaction.TransactionEngine deleted file mode 100644 index 7fdc10b59..000000000 --- a/lealone-aote/src/main/resources/META-INF/services/org.lealone.transaction.TransactionEngine +++ /dev/null @@ -1 +0,0 @@ -org.lealone.transaction.aote.AOTransactionEngine diff --git a/lealone-client/pom.xml b/lealone-client/pom.xml index 98a1d1314..afe98b45a 100644 --- a/lealone-client/pom.xml +++ b/lealone-client/pom.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.lealone + com.lealone lealone 6.0.0-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ - org.lealone + com.lealone lealone-net ${project.version} @@ -50,7 +50,7 @@ - org.lealone.client.LealoneClient + com.lealone.client.LealoneClient true Lealone Database Group diff --git a/lealone-client/src/main/java/org/lealone/client/ClientScheduler.java b/lealone-client/src/main/java/com/lealone/client/ClientScheduler.java similarity index 79% rename from lealone-client/src/main/java/org/lealone/client/ClientScheduler.java rename to lealone-client/src/main/java/com/lealone/client/ClientScheduler.java index 11a7e7af4..6c8b9f1b2 100644 --- a/lealone-client/src/main/java/org/lealone/client/ClientScheduler.java +++ b/lealone-client/src/main/java/com/lealone/client/ClientScheduler.java @@ -3,24 +3,24 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.client; +package com.lealone.client; import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; -import org.lealone.common.logging.Logger; -import org.lealone.common.logging.LoggerFactory; -import org.lealone.common.util.CaseInsensitiveMap; -import org.lealone.common.util.MapUtils; -import org.lealone.db.ConnectionInfo; -import org.lealone.db.ConnectionSetting; -import org.lealone.db.async.AsyncTask; -import org.lealone.db.scheduler.Scheduler; -import org.lealone.db.scheduler.SchedulerFactoryBase; -import org.lealone.net.NetClient; -import org.lealone.net.NetFactory; -import org.lealone.net.NetFactoryManager; -import org.lealone.net.NetScheduler; +import com.lealone.common.logging.Logger; +import com.lealone.common.logging.LoggerFactory; +import com.lealone.common.util.CaseInsensitiveMap; +import com.lealone.common.util.MapUtils; +import com.lealone.db.ConnectionInfo; +import com.lealone.db.ConnectionSetting; +import com.lealone.db.async.AsyncTask; +import com.lealone.db.scheduler.Scheduler; +import com.lealone.db.scheduler.SchedulerFactoryBase; +import com.lealone.net.NetClient; +import com.lealone.net.NetFactory; +import com.lealone.net.NetFactoryManager; +import com.lealone.net.NetScheduler; public class ClientScheduler extends NetScheduler { diff --git a/lealone-client/src/main/java/org/lealone/client/ClientServiceProxy.java b/lealone-client/src/main/java/com/lealone/client/ClientServiceProxy.java similarity index 92% rename from lealone-client/src/main/java/org/lealone/client/ClientServiceProxy.java rename to lealone-client/src/main/java/com/lealone/client/ClientServiceProxy.java index 102ad582b..a3abfdde0 100644 --- a/lealone-client/src/main/java/org/lealone/client/ClientServiceProxy.java +++ b/lealone-client/src/main/java/com/lealone/client/ClientServiceProxy.java @@ -3,7 +3,7 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.client; +package com.lealone.client; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,9 +11,9 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import org.lealone.db.ConnectionInfo; -import org.lealone.db.ConnectionSetting; -import org.lealone.db.Constants; +import com.lealone.db.ConnectionInfo; +import com.lealone.db.ConnectionSetting; +import com.lealone.db.Constants; public class ClientServiceProxy { diff --git a/lealone-client/src/main/java/org/lealone/client/LealoneClient.java b/lealone-client/src/main/java/com/lealone/client/LealoneClient.java similarity index 97% rename from lealone-client/src/main/java/org/lealone/client/LealoneClient.java rename to lealone-client/src/main/java/com/lealone/client/LealoneClient.java index 25c734535..fae08dcb7 100644 --- a/lealone-client/src/main/java/org/lealone/client/LealoneClient.java +++ b/lealone-client/src/main/java/com/lealone/client/LealoneClient.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client; +package com.lealone.client; import java.io.BufferedReader; import java.io.IOException; @@ -20,17 +20,17 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; -import org.lealone.client.jdbc.JdbcConnection; -import org.lealone.client.jdbc.JdbcDriver; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.util.IOUtils; -import org.lealone.common.util.JdbcUtils; -import org.lealone.common.util.ScriptReader; -import org.lealone.common.util.StringUtils; -import org.lealone.db.ConnectionInfo; -import org.lealone.db.ConnectionSetting; -import org.lealone.db.Constants; -import org.lealone.db.async.Future; +import com.lealone.client.jdbc.JdbcConnection; +import com.lealone.client.jdbc.JdbcDriver; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.util.IOUtils; +import com.lealone.common.util.JdbcUtils; +import com.lealone.common.util.ScriptReader; +import com.lealone.common.util.StringUtils; +import com.lealone.db.ConnectionInfo; +import com.lealone.db.ConnectionSetting; +import com.lealone.db.Constants; +import com.lealone.db.async.Future; /** * Interactive command line tool to access a database using JDBC. diff --git a/lealone-client/src/main/java/org/lealone/client/command/ClientPreparedSQLCommand.java b/lealone-client/src/main/java/com/lealone/client/command/ClientPreparedSQLCommand.java similarity index 81% rename from lealone-client/src/main/java/org/lealone/client/command/ClientPreparedSQLCommand.java rename to lealone-client/src/main/java/com/lealone/client/command/ClientPreparedSQLCommand.java index 8ec557b61..29bfb4c76 100644 --- a/lealone-client/src/main/java/org/lealone/client/command/ClientPreparedSQLCommand.java +++ b/lealone-client/src/main/java/com/lealone/client/command/ClientPreparedSQLCommand.java @@ -3,38 +3,38 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.client.command; +package com.lealone.client.command; import java.util.ArrayList; import java.util.List; -import org.lealone.client.result.ClientResult; -import org.lealone.client.result.RowCountDeterminedClientResult; -import org.lealone.client.session.ClientSession; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.trace.Trace; -import org.lealone.common.util.Utils; -import org.lealone.db.CommandParameter; -import org.lealone.db.SysProperties; -import org.lealone.db.async.AsyncCallback; -import org.lealone.db.async.Future; -import org.lealone.db.result.Result; -import org.lealone.db.value.Value; -import org.lealone.net.TransferInputStream; -import org.lealone.server.protocol.Packet; -import org.lealone.server.protocol.batch.BatchStatementPreparedUpdate; -import org.lealone.server.protocol.batch.BatchStatementUpdateAck; -import org.lealone.server.protocol.ps.PreparedStatementClose; -import org.lealone.server.protocol.ps.PreparedStatementGetMetaData; -import org.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck; -import org.lealone.server.protocol.ps.PreparedStatementPrepare; -import org.lealone.server.protocol.ps.PreparedStatementPrepareAck; -import org.lealone.server.protocol.ps.PreparedStatementPrepareReadParams; -import org.lealone.server.protocol.ps.PreparedStatementPrepareReadParamsAck; -import org.lealone.server.protocol.ps.PreparedStatementQuery; -import org.lealone.server.protocol.ps.PreparedStatementUpdate; -import org.lealone.server.protocol.statement.StatementQueryAck; -import org.lealone.server.protocol.statement.StatementUpdateAck; +import com.lealone.client.result.ClientResult; +import com.lealone.client.result.RowCountDeterminedClientResult; +import com.lealone.client.session.ClientSession; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.trace.Trace; +import com.lealone.common.util.Utils; +import com.lealone.db.CommandParameter; +import com.lealone.db.SysProperties; +import com.lealone.db.async.AsyncCallback; +import com.lealone.db.async.Future; +import com.lealone.db.result.Result; +import com.lealone.db.value.Value; +import com.lealone.net.TransferInputStream; +import com.lealone.server.protocol.Packet; +import com.lealone.server.protocol.batch.BatchStatementPreparedUpdate; +import com.lealone.server.protocol.batch.BatchStatementUpdateAck; +import com.lealone.server.protocol.ps.PreparedStatementClose; +import com.lealone.server.protocol.ps.PreparedStatementGetMetaData; +import com.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck; +import com.lealone.server.protocol.ps.PreparedStatementPrepare; +import com.lealone.server.protocol.ps.PreparedStatementPrepareAck; +import com.lealone.server.protocol.ps.PreparedStatementPrepareReadParams; +import com.lealone.server.protocol.ps.PreparedStatementPrepareReadParamsAck; +import com.lealone.server.protocol.ps.PreparedStatementQuery; +import com.lealone.server.protocol.ps.PreparedStatementUpdate; +import com.lealone.server.protocol.statement.StatementQueryAck; +import com.lealone.server.protocol.statement.StatementUpdateAck; public class ClientPreparedSQLCommand extends ClientSQLCommand { diff --git a/lealone-client/src/main/java/org/lealone/client/command/ClientSQLCommand.java b/lealone-client/src/main/java/com/lealone/client/command/ClientSQLCommand.java similarity index 82% rename from lealone-client/src/main/java/org/lealone/client/command/ClientSQLCommand.java rename to lealone-client/src/main/java/com/lealone/client/command/ClientSQLCommand.java index e1e2acd96..993a429d6 100644 --- a/lealone-client/src/main/java/org/lealone/client/command/ClientSQLCommand.java +++ b/lealone-client/src/main/java/com/lealone/client/command/ClientSQLCommand.java @@ -3,30 +3,30 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.client.command; +package com.lealone.client.command; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.lealone.client.result.ClientResult; -import org.lealone.client.result.RowCountDeterminedClientResult; -import org.lealone.client.result.RowCountUndeterminedClientResult; -import org.lealone.client.session.ClientSession; -import org.lealone.common.exceptions.DbException; -import org.lealone.db.CommandParameter; -import org.lealone.db.async.AsyncCallback; -import org.lealone.db.async.Future; -import org.lealone.db.result.Result; -import org.lealone.net.TransferInputStream; -import org.lealone.server.protocol.Packet; -import org.lealone.server.protocol.batch.BatchStatementUpdate; -import org.lealone.server.protocol.batch.BatchStatementUpdateAck; -import org.lealone.server.protocol.statement.StatementQuery; -import org.lealone.server.protocol.statement.StatementQueryAck; -import org.lealone.server.protocol.statement.StatementUpdate; -import org.lealone.server.protocol.statement.StatementUpdateAck; -import org.lealone.sql.SQLCommand; +import com.lealone.client.result.ClientResult; +import com.lealone.client.result.RowCountDeterminedClientResult; +import com.lealone.client.result.RowCountUndeterminedClientResult; +import com.lealone.client.session.ClientSession; +import com.lealone.common.exceptions.DbException; +import com.lealone.db.CommandParameter; +import com.lealone.db.async.AsyncCallback; +import com.lealone.db.async.Future; +import com.lealone.db.result.Result; +import com.lealone.net.TransferInputStream; +import com.lealone.server.protocol.Packet; +import com.lealone.server.protocol.batch.BatchStatementUpdate; +import com.lealone.server.protocol.batch.BatchStatementUpdateAck; +import com.lealone.server.protocol.statement.StatementQuery; +import com.lealone.server.protocol.statement.StatementQueryAck; +import com.lealone.server.protocol.statement.StatementUpdate; +import com.lealone.server.protocol.statement.StatementUpdateAck; +import com.lealone.sql.SQLCommand; public class ClientSQLCommand implements SQLCommand { diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcArray.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcArray.java similarity index 78% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcArray.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcArray.java index 49c193e28..9a9895032 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcArray.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcArray.java @@ -3,11 +3,11 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; -import org.lealone.common.trace.TraceObjectType; -import org.lealone.db.value.ArrayBase; -import org.lealone.db.value.Value; +import com.lealone.common.trace.TraceObjectType; +import com.lealone.db.value.ArrayBase; +import com.lealone.db.value.Value; /** * Represents an ARRAY value. diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcAsyncCallback.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcAsyncCallback.java similarity index 83% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcAsyncCallback.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcAsyncCallback.java index 17202e8bf..2ee548ca0 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcAsyncCallback.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcAsyncCallback.java @@ -3,11 +3,11 @@ * Licensed under the Server Side Public License, v 1. * Initial Developer: zhh */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.sql.SQLException; -import org.lealone.db.async.ConcurrentAsyncCallback; +import com.lealone.db.async.ConcurrentAsyncCallback; public class JdbcAsyncCallback extends ConcurrentAsyncCallback { diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcBatchUpdateException.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcBatchUpdateException.java similarity index 98% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcBatchUpdateException.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcBatchUpdateException.java index 458cf0099..f0d757612 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcBatchUpdateException.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcBatchUpdateException.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcBlob.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcBlob.java similarity index 92% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcBlob.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcBlob.java index 1a18f1924..213b0ad03 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcBlob.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcBlob.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; @@ -13,11 +13,11 @@ import java.io.PipedOutputStream; import java.sql.SQLException; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.trace.TraceObjectType; -import org.lealone.common.util.Task; -import org.lealone.db.value.BlobBase; -import org.lealone.db.value.Value; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.trace.TraceObjectType; +import com.lealone.common.util.Task; +import com.lealone.db.value.BlobBase; +import com.lealone.db.value.Value; /** * Represents a BLOB value. diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcCallableStatement.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcCallableStatement.java similarity index 99% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcCallableStatement.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcCallableStatement.java index c8ec1da0d..849848a4c 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcCallableStatement.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcCallableStatement.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.io.InputStream; import java.io.Reader; @@ -26,13 +26,13 @@ import java.util.HashMap; import java.util.Map; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.trace.TraceObjectType; -import org.lealone.common.util.BitField; -import org.lealone.db.CommandParameter; -import org.lealone.db.api.ErrorCode; -import org.lealone.db.value.ValueNull; -import org.lealone.sql.SQLCommand; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.trace.TraceObjectType; +import com.lealone.common.util.BitField; +import com.lealone.db.CommandParameter; +import com.lealone.db.api.ErrorCode; +import com.lealone.db.value.ValueNull; +import com.lealone.sql.SQLCommand; /** * Represents a callable statement. diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcClob.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcClob.java similarity index 91% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcClob.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcClob.java index 97bc0c3c3..17dc657e7 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcClob.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcClob.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.io.IOException; import java.io.PipedInputStream; @@ -12,12 +12,12 @@ import java.io.Writer; import java.sql.SQLException; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.trace.TraceObjectType; -import org.lealone.common.util.IOUtils; -import org.lealone.common.util.Task; -import org.lealone.db.value.ClobBase; -import org.lealone.db.value.Value; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.trace.TraceObjectType; +import com.lealone.common.util.IOUtils; +import com.lealone.common.util.Task; +import com.lealone.db.value.ClobBase; +import com.lealone.db.value.Value; /** * Represents a CLOB value. diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcConnection.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcConnection.java similarity index 98% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcConnection.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcConnection.java index bec6676cb..9c1832e6d 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcConnection.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcConnection.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.io.InputStream; import java.io.Reader; @@ -27,24 +27,24 @@ import java.util.Properties; import java.util.concurrent.Executor; -import org.lealone.common.exceptions.DbException; -import org.lealone.common.trace.Trace; -import org.lealone.common.trace.TraceModuleType; -import org.lealone.common.trace.TraceObjectType; -import org.lealone.common.util.JdbcUtils; -import org.lealone.common.util.Utils; -import org.lealone.db.ConnectionInfo; -import org.lealone.db.Constants; -import org.lealone.db.SysProperties; -import org.lealone.db.api.ErrorCode; -import org.lealone.db.async.Future; -import org.lealone.db.session.Session; -import org.lealone.db.value.CompareMode; -import org.lealone.db.value.DataType; -import org.lealone.db.value.Value; -import org.lealone.db.value.ValueLob; -import org.lealone.db.value.ValueNull; -import org.lealone.sql.SQLCommand; +import com.lealone.common.exceptions.DbException; +import com.lealone.common.trace.Trace; +import com.lealone.common.trace.TraceModuleType; +import com.lealone.common.trace.TraceObjectType; +import com.lealone.common.util.JdbcUtils; +import com.lealone.common.util.Utils; +import com.lealone.db.ConnectionInfo; +import com.lealone.db.Constants; +import com.lealone.db.SysProperties; +import com.lealone.db.api.ErrorCode; +import com.lealone.db.async.Future; +import com.lealone.db.session.Session; +import com.lealone.db.value.CompareMode; +import com.lealone.db.value.DataType; +import com.lealone.db.value.Value; +import com.lealone.db.value.ValueLob; +import com.lealone.db.value.ValueNull; +import com.lealone.sql.SQLCommand; /** *

diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDataSource.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDataSource.java similarity index 98% rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDataSource.java rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDataSource.java index d6d12718b..ffff24bb3 100644 --- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDataSource.java +++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDataSource.java @@ -3,7 +3,7 @@ * and the EPL 1.0 (http://h2database.com/html/license.html). * Initial Developer: H2 Group */ -package org.lealone.client.jdbc; +package com.lealone.client.jdbc; import java.io.IOException; import java.io.ObjectInputStream; @@ -21,8 +21,8 @@ import javax.sql.XAConnection; import javax.sql.XADataSource; -import org.lealone.common.trace.TraceObjectType; -import org.lealone.common.util.StringUtils; +import com.lealone.common.trace.TraceObjectType; +import com.lealone.common.util.StringUtils; /** * A data source for Lealone database connections. @@ -31,7 +31,7 @@ * use the following code: * * 

- * import org.lealone.client.jdbcx.JdbcDataSource;
+ * import com.lealone.client.jdbcx.JdbcDataSource;
  * import javax.naming.Context;
  * import javax.naming.InitialContext;
  * JdbcDataSource ds = new JdbcDataSource();
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDataSourceFactory.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDataSourceFactory.java
similarity index 91%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDataSourceFactory.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDataSourceFactory.java
index 5fa9caff8..0ffc7b7cf 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDataSourceFactory.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDataSourceFactory.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.util.Hashtable;
 
@@ -12,12 +12,12 @@
 import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
 
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
 
 /**
  * This class is used to create new DataSource objects.
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDatabaseMetaData.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDatabaseMetaData.java
similarity index 99%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDatabaseMetaData.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDatabaseMetaData.java
index bf1fcf15a..4bd52ed80 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDatabaseMetaData.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDatabaseMetaData.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -12,11 +12,11 @@
 import java.sql.RowIdLifetime;
 import java.sql.SQLException;
 
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
 
 /**
  * Represents the meta data for a database.
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDriver.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDriver.java
similarity index 95%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDriver.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDriver.java
index e90d213b5..31e0f327a 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcDriver.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcDriver.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -13,11 +13,11 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
 
 /**
  * The database driver. An application should not use this class directly. 
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcParameterMetaData.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcParameterMetaData.java
similarity index 95%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcParameterMetaData.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcParameterMetaData.java
index beeb5ad44..67a5ef7c7 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcParameterMetaData.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcParameterMetaData.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.ParameterMetaData;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.sql.SQLCommand;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.sql.SQLCommand;
 
 /**
  * Information about the parameters of a prepared statement.
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcPreparedStatement.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcPreparedStatement.java
similarity index 97%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcPreparedStatement.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcPreparedStatement.java
index 16476047b..e0a4430ee 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcPreparedStatement.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcPreparedStatement.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -30,35 +30,35 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.lealone.client.command.ClientPreparedSQLCommand;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.BlobBase;
-import org.lealone.db.value.ClobBase;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.sql.SQLCommand;
+import com.lealone.client.command.ClientPreparedSQLCommand;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.BlobBase;
+import com.lealone.db.value.ClobBase;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.sql.SQLCommand;
 
 /**
  * Represents a prepared statement.
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcResultSet.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcResultSet.java
similarity index 98%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcResultSet.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcResultSet.java
index 3cfed081a..4703f22ab 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcResultSet.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcResultSet.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -28,34 +28,34 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.lealone.client.result.ClientResult;
-import org.lealone.client.result.UpdatableRow;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Command;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
+import com.lealone.client.result.ClientResult;
+import com.lealone.client.result.UpdatableRow;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Command;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
 
 /**
  * 

diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcResultSetMetaData.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcResultSetMetaData.java
similarity index 98%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcResultSetMetaData.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcResultSetMetaData.java
index b39c87c53..cfc21a21b 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcResultSetMetaData.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcResultSetMetaData.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.DataType;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.DataType;
 
 /**
  * Represents the meta data for a ResultSet.
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcSavepoint.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcSavepoint.java
similarity index 91%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcSavepoint.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcSavepoint.java
index baa6c3d89..ec24d6647 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcSavepoint.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcSavepoint.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.SQLException;
 import java.sql.Savepoint;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceObject;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceObject;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * A savepoint is a point inside a transaction to where a transaction can be
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcStatement.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcStatement.java
similarity index 98%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcStatement.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcStatement.java
index 3eb82f4cb..011590013 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcStatement.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcStatement.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -14,18 +14,18 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.lealone.client.command.ClientSQLCommand;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Command;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.Session;
-import org.lealone.sql.SQLCommand;
+import com.lealone.client.command.ClientSQLCommand;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Command;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.Session;
+import com.lealone.sql.SQLCommand;
 
 /**
  * Represents a statement.
diff --git a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcWrapper.java b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcWrapper.java
similarity index 86%
rename from lealone-client/src/main/java/org/lealone/client/jdbc/JdbcWrapper.java
rename to lealone-client/src/main/java/com/lealone/client/jdbc/JdbcWrapper.java
index ab63a86c5..9b2fd5d1c 100644
--- a/lealone-client/src/main/java/org/lealone/client/jdbc/JdbcWrapper.java
+++ b/lealone-client/src/main/java/com/lealone/client/jdbc/JdbcWrapper.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.client.jdbc;
+package com.lealone.client.jdbc;
 
 import java.sql.SQLException;
 import java.sql.Wrapper;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObject;
-import org.lealone.db.async.AsyncCallback;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObject;
+import com.lealone.db.async.AsyncCallback;
 
 public class JdbcWrapper extends TraceObject implements Wrapper {
 
diff --git a/lealone-client/src/main/java/org/lealone/client/result/ClientResult.java b/lealone-client/src/main/java/com/lealone/client/result/ClientResult.java
similarity index 89%
rename from lealone-client/src/main/java/org/lealone/client/result/ClientResult.java
rename to lealone-client/src/main/java/com/lealone/client/result/ClientResult.java
index fff6adaf3..3e124df97 100644
--- a/lealone-client/src/main/java/org/lealone/client/result/ClientResult.java
+++ b/lealone-client/src/main/java/com/lealone/client/result/ClientResult.java
@@ -3,24 +3,24 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.result;
+package com.lealone.client.result;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.lealone.client.jdbc.JdbcAsyncCallback;
-import org.lealone.client.session.ClientSession;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
-import org.lealone.db.SysProperties;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.Value;
-import org.lealone.net.TransferInputStream;
-import org.lealone.server.protocol.result.ResultChangeId;
-import org.lealone.server.protocol.result.ResultClose;
-import org.lealone.server.protocol.result.ResultFetchRows;
-import org.lealone.server.protocol.result.ResultFetchRowsAck;
-import org.lealone.server.protocol.result.ResultReset;
+import com.lealone.client.jdbc.JdbcAsyncCallback;
+import com.lealone.client.session.ClientSession;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
+import com.lealone.db.SysProperties;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.Value;
+import com.lealone.net.TransferInputStream;
+import com.lealone.server.protocol.result.ResultChangeId;
+import com.lealone.server.protocol.result.ResultClose;
+import com.lealone.server.protocol.result.ResultFetchRows;
+import com.lealone.server.protocol.result.ResultFetchRowsAck;
+import com.lealone.server.protocol.result.ResultReset;
 
 /**
  * The client side part of a result set that is kept on the server.
diff --git a/lealone-client/src/main/java/org/lealone/client/result/ClientResultColumn.java b/lealone-client/src/main/java/com/lealone/client/result/ClientResultColumn.java
similarity index 95%
rename from lealone-client/src/main/java/org/lealone/client/result/ClientResultColumn.java
rename to lealone-client/src/main/java/com/lealone/client/result/ClientResultColumn.java
index 8a24ad6df..c4891f865 100644
--- a/lealone-client/src/main/java/org/lealone/client/result/ClientResultColumn.java
+++ b/lealone-client/src/main/java/com/lealone/client/result/ClientResultColumn.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.result;
+package com.lealone.client.result;
 
 import java.io.IOException;
 
-import org.lealone.net.TransferInputStream;
+import com.lealone.net.TransferInputStream;
 
 /**
  * A column of the client result.
diff --git a/lealone-client/src/main/java/org/lealone/client/result/RowCountDeterminedClientResult.java b/lealone-client/src/main/java/com/lealone/client/result/RowCountDeterminedClientResult.java
similarity index 89%
rename from lealone-client/src/main/java/org/lealone/client/result/RowCountDeterminedClientResult.java
rename to lealone-client/src/main/java/com/lealone/client/result/RowCountDeterminedClientResult.java
index 35d7edc98..10aa736c7 100644
--- a/lealone-client/src/main/java/org/lealone/client/result/RowCountDeterminedClientResult.java
+++ b/lealone-client/src/main/java/com/lealone/client/result/RowCountDeterminedClientResult.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.client.result;
+package com.lealone.client.result;
 
 import java.io.IOException;
 
-import org.lealone.client.session.ClientSession;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.value.Value;
-import org.lealone.net.TransferInputStream;
+import com.lealone.client.session.ClientSession;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.value.Value;
+import com.lealone.net.TransferInputStream;
 
 public class RowCountDeterminedClientResult extends ClientResult {
 
diff --git a/lealone-client/src/main/java/org/lealone/client/result/RowCountUndeterminedClientResult.java b/lealone-client/src/main/java/com/lealone/client/result/RowCountUndeterminedClientResult.java
similarity index 91%
rename from lealone-client/src/main/java/org/lealone/client/result/RowCountUndeterminedClientResult.java
rename to lealone-client/src/main/java/com/lealone/client/result/RowCountUndeterminedClientResult.java
index 15795e8de..ad3fff243 100644
--- a/lealone-client/src/main/java/org/lealone/client/result/RowCountUndeterminedClientResult.java
+++ b/lealone-client/src/main/java/com/lealone/client/result/RowCountUndeterminedClientResult.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.client.result;
+package com.lealone.client.result;
 
 import java.io.IOException;
 
-import org.lealone.client.session.ClientSession;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.value.Value;
-import org.lealone.net.TransferInputStream;
+import com.lealone.client.session.ClientSession;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.value.Value;
+import com.lealone.net.TransferInputStream;
 
 public class RowCountUndeterminedClientResult extends ClientResult {
 
diff --git a/lealone-client/src/main/java/org/lealone/client/result/UpdatableRow.java b/lealone-client/src/main/java/com/lealone/client/result/UpdatableRow.java
similarity index 95%
rename from lealone-client/src/main/java/org/lealone/client/result/UpdatableRow.java
rename to lealone-client/src/main/java/com/lealone/client/result/UpdatableRow.java
index 1edfa21a4..8f461c41c 100644
--- a/lealone-client/src/main/java/org/lealone/client/result/UpdatableRow.java
+++ b/lealone-client/src/main/java/com/lealone/client/result/UpdatableRow.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.result;
+package com.lealone.client.result;
 
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -11,16 +11,16 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-import org.lealone.client.jdbc.JdbcConnection;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
+import com.lealone.client.jdbc.JdbcConnection;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
 
 /**
  * This class is used for updatable result sets.
diff --git a/lealone-client/src/main/java/org/lealone/client/session/AutoReconnectSession.java b/lealone-client/src/main/java/com/lealone/client/session/AutoReconnectSession.java
similarity index 88%
rename from lealone-client/src/main/java/org/lealone/client/session/AutoReconnectSession.java
rename to lealone-client/src/main/java/com/lealone/client/session/AutoReconnectSession.java
index 05b796de4..2239b2634 100644
--- a/lealone-client/src/main/java/org/lealone/client/session/AutoReconnectSession.java
+++ b/lealone-client/src/main/java/com/lealone/client/session/AutoReconnectSession.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.client.session;
+package com.lealone.client.session;
 
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.session.DelegatedSession;
-import org.lealone.db.session.Session;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.session.DelegatedSession;
+import com.lealone.db.session.Session;
 
 class AutoReconnectSession extends DelegatedSession {
 
diff --git a/lealone-client/src/main/java/org/lealone/client/session/ClientSession.java b/lealone-client/src/main/java/com/lealone/client/session/ClientSession.java
similarity index 87%
rename from lealone-client/src/main/java/org/lealone/client/session/ClientSession.java
rename to lealone-client/src/main/java/com/lealone/client/session/ClientSession.java
index 45888fd12..080de245c 100644
--- a/lealone-client/src/main/java/org/lealone/client/session/ClientSession.java
+++ b/lealone-client/src/main/java/com/lealone/client/session/ClientSession.java
@@ -3,45 +3,45 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.client.session;
+package com.lealone.client.session;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import org.lealone.client.command.ClientPreparedSQLCommand;
-import org.lealone.client.command.ClientSQLCommand;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.DataHandler;
-import org.lealone.db.DbSetting;
-import org.lealone.db.LocalDataHandler;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.ConcurrentAsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.async.SingleThreadAsyncCallback;
-import org.lealone.db.session.Session;
-import org.lealone.db.session.SessionBase;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.TcpClientConnection;
-import org.lealone.net.TransferOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.AckPacketHandler;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketDecoders;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.lob.LobRead;
-import org.lealone.server.protocol.lob.LobReadAck;
-import org.lealone.server.protocol.session.SessionCancelStatement;
-import org.lealone.server.protocol.session.SessionClose;
-import org.lealone.server.protocol.session.SessionSetAutoCommit;
-import org.lealone.sql.SQLCommand;
-import org.lealone.storage.lob.LobLocalStorage;
+import com.lealone.client.command.ClientPreparedSQLCommand;
+import com.lealone.client.command.ClientSQLCommand;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.DataHandler;
+import com.lealone.db.DbSetting;
+import com.lealone.db.LocalDataHandler;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.ConcurrentAsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.async.SingleThreadAsyncCallback;
+import com.lealone.db.session.Session;
+import com.lealone.db.session.SessionBase;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.TcpClientConnection;
+import com.lealone.net.TransferOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.AckPacketHandler;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketDecoders;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.lob.LobRead;
+import com.lealone.server.protocol.lob.LobReadAck;
+import com.lealone.server.protocol.session.SessionCancelStatement;
+import com.lealone.server.protocol.session.SessionClose;
+import com.lealone.server.protocol.session.SessionSetAutoCommit;
+import com.lealone.sql.SQLCommand;
+import com.lealone.storage.lob.LobLocalStorage;
 
 /**
  * The client side part of a session when using the server mode. 
diff --git a/lealone-client/src/main/java/org/lealone/client/session/ClientSessionFactory.java b/lealone-client/src/main/java/com/lealone/client/session/ClientSessionFactory.java
similarity index 89%
rename from lealone-client/src/main/java/org/lealone/client/session/ClientSessionFactory.java
rename to lealone-client/src/main/java/com/lealone/client/session/ClientSessionFactory.java
index 92a17262e..79cd5f2e1 100644
--- a/lealone-client/src/main/java/org/lealone/client/session/ClientSessionFactory.java
+++ b/lealone-client/src/main/java/com/lealone/client/session/ClientSessionFactory.java
@@ -3,32 +3,32 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.client.session;
+package com.lealone.client.session;
 
 import java.util.Random;
 
-import org.lealone.client.ClientScheduler;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.Session;
-import org.lealone.db.session.SessionFactoryBase;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.NetClient;
-import org.lealone.net.NetEventLoop;
-import org.lealone.net.NetFactory;
-import org.lealone.net.NetFactoryManager;
-import org.lealone.net.NetNode;
-import org.lealone.net.TcpClientConnection;
-import org.lealone.server.protocol.AckPacketHandler;
-import org.lealone.server.protocol.session.SessionInit;
-import org.lealone.server.protocol.session.SessionInitAck;
+import com.lealone.client.ClientScheduler;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.Session;
+import com.lealone.db.session.SessionFactoryBase;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.NetClient;
+import com.lealone.net.NetEventLoop;
+import com.lealone.net.NetFactory;
+import com.lealone.net.NetFactoryManager;
+import com.lealone.net.NetNode;
+import com.lealone.net.TcpClientConnection;
+import com.lealone.server.protocol.AckPacketHandler;
+import com.lealone.server.protocol.session.SessionInit;
+import com.lealone.server.protocol.session.SessionInitAck;
 
 public class ClientSessionFactory extends SessionFactoryBase {
 
diff --git a/lealone-client/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory b/lealone-client/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory
new file mode 100644
index 000000000..8c703dfd3
--- /dev/null
+++ b/lealone-client/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory
@@ -0,0 +1 @@
+com.lealone.client.session.ClientSessionFactory
\ No newline at end of file
diff --git a/lealone-client/src/main/resources/META-INF/services/java.sql.Driver b/lealone-client/src/main/resources/META-INF/services/java.sql.Driver
index bde5a7c33..43033d1ae 100644
--- a/lealone-client/src/main/resources/META-INF/services/java.sql.Driver
+++ b/lealone-client/src/main/resources/META-INF/services/java.sql.Driver
@@ -1 +1 @@
-org.lealone.client.jdbc.JdbcDriver
\ No newline at end of file
+com.lealone.client.jdbc.JdbcDriver
\ No newline at end of file
diff --git a/lealone-client/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory b/lealone-client/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory
deleted file mode 100644
index 1359c5184..000000000
--- a/lealone-client/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.client.session.ClientSessionFactory
\ No newline at end of file
diff --git a/lealone-common/pom.xml b/lealone-common/pom.xml
index d67a769ef..2e0e3176a 100644
--- a/lealone-common/pom.xml
+++ b/lealone-common/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/CompressDeflate.java b/lealone-common/src/main/java/com/lealone/common/compress/CompressDeflate.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/compress/CompressDeflate.java
rename to lealone-common/src/main/java/com/lealone/common/compress/CompressDeflate.java
index 13d71237c..ec95f8ddc 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/CompressDeflate.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/CompressDeflate.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 import java.util.StringTokenizer;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * This is a wrapper class for the Deflater class.
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/CompressLZF.java b/lealone-common/src/main/java/com/lealone/common/compress/CompressLZF.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/compress/CompressLZF.java
rename to lealone-common/src/main/java/com/lealone/common/compress/CompressLZF.java
index 1cbd39dc3..97af2516d 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/CompressLZF.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/CompressLZF.java
@@ -47,7 +47,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 import java.nio.ByteBuffer;
 
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/CompressNo.java b/lealone-common/src/main/java/com/lealone/common/compress/CompressNo.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/compress/CompressNo.java
rename to lealone-common/src/main/java/com/lealone/common/compress/CompressNo.java
index ad8d5903f..b9857d0c6 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/CompressNo.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/CompressNo.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 /**
  * This class implements a data compression algorithm that does in fact not
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/CompressTool.java b/lealone-common/src/main/java/com/lealone/common/compress/CompressTool.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/compress/CompressTool.java
rename to lealone-common/src/main/java/com/lealone/common/compress/CompressTool.java
index 083ed3ad3..e67ba14ab 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/CompressTool.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/CompressTool.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,11 +16,11 @@
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * A tool to losslessly compress data, and expand the compressed data again.
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/Compressor.java b/lealone-common/src/main/java/com/lealone/common/compress/Compressor.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/compress/Compressor.java
rename to lealone-common/src/main/java/com/lealone/common/compress/Compressor.java
index 5850abaaa..57a0301e3 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/Compressor.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/Compressor.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 /**
  * Each data compression algorithm must implement this interface.
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/LZFInputStream.java b/lealone-common/src/main/java/com/lealone/common/compress/LZFInputStream.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/compress/LZFInputStream.java
rename to lealone-common/src/main/java/com/lealone/common/compress/LZFInputStream.java
index ee197201e..ff2ab6b54 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/LZFInputStream.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/LZFInputStream.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
 
 /**
  * An input stream to read from an LZF stream.
diff --git a/lealone-common/src/main/java/org/lealone/common/compress/LZFOutputStream.java b/lealone-common/src/main/java/com/lealone/common/compress/LZFOutputStream.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/compress/LZFOutputStream.java
rename to lealone-common/src/main/java/com/lealone/common/compress/LZFOutputStream.java
index f00cfe016..ab66d6fa1 100644
--- a/lealone-common/src/main/java/org/lealone/common/compress/LZFOutputStream.java
+++ b/lealone-common/src/main/java/com/lealone/common/compress/LZFOutputStream.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.compress;
+package com.lealone.common.compress;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.lealone.db.Constants;
+import com.lealone.db.Constants;
 
 /**
  * An output stream to write an LZF stream.
diff --git a/lealone-common/src/main/java/org/lealone/common/exceptions/ConfigException.java b/lealone-common/src/main/java/com/lealone/common/exceptions/ConfigException.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/common/exceptions/ConfigException.java
rename to lealone-common/src/main/java/com/lealone/common/exceptions/ConfigException.java
index 551f1d289..fdbceee22 100644
--- a/lealone-common/src/main/java/org/lealone/common/exceptions/ConfigException.java
+++ b/lealone-common/src/main/java/com/lealone/common/exceptions/ConfigException.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.exceptions;
+package com.lealone.common.exceptions;
 
 public class ConfigException extends RuntimeException {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/exceptions/DbException.java b/lealone-common/src/main/java/com/lealone/common/exceptions/DbException.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/exceptions/DbException.java
rename to lealone-common/src/main/java/com/lealone/common/exceptions/DbException.java
index 0ea3b8bc9..0a0c3517c 100644
--- a/lealone-common/src/main/java/org/lealone/common/exceptions/DbException.java
+++ b/lealone-common/src/main/java/com/lealone/common/exceptions/DbException.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.exceptions;
+package com.lealone.common.exceptions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,14 +14,15 @@
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.Map.Entry;
-import java.util.Properties;
 
-import org.lealone.common.util.SortedProperties;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.util.SortedProperties;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+
+import java.util.Properties;
 
 /**
  * This exception wraps a checked exception.
diff --git a/lealone-common/src/main/java/org/lealone/common/exceptions/JdbcSQLException.java b/lealone-common/src/main/java/com/lealone/common/exceptions/JdbcSQLException.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/exceptions/JdbcSQLException.java
rename to lealone-common/src/main/java/com/lealone/common/exceptions/JdbcSQLException.java
index d7af8b94c..ed31b659b 100644
--- a/lealone-common/src/main/java/org/lealone/common/exceptions/JdbcSQLException.java
+++ b/lealone-common/src/main/java/com/lealone/common/exceptions/JdbcSQLException.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.exceptions;
+package com.lealone.common.exceptions;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.sql.SQLException;
 
-import org.lealone.db.Constants;
+import com.lealone.db.Constants;
 
 /**
  * Represents a database exception.
diff --git a/lealone-common/src/main/java/org/lealone/common/exceptions/UnsupportedSchemaException.java b/lealone-common/src/main/java/com/lealone/common/exceptions/UnsupportedSchemaException.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/common/exceptions/UnsupportedSchemaException.java
rename to lealone-common/src/main/java/com/lealone/common/exceptions/UnsupportedSchemaException.java
index eee3b1517..86b7460a7 100644
--- a/lealone-common/src/main/java/org/lealone/common/exceptions/UnsupportedSchemaException.java
+++ b/lealone-common/src/main/java/com/lealone/common/exceptions/UnsupportedSchemaException.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.exceptions;
+package com.lealone.common.exceptions;
 
-import org.lealone.db.session.Session;
+import com.lealone.db.session.Session;
 
 public class UnsupportedSchemaException extends RuntimeException {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/logging/Logger.java b/lealone-common/src/main/java/com/lealone/common/logging/Logger.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/logging/Logger.java
rename to lealone-common/src/main/java/com/lealone/common/logging/Logger.java
index c0964f7f5..3fda2c3dd 100644
--- a/lealone-common/src/main/java/org/lealone/common/logging/Logger.java
+++ b/lealone-common/src/main/java/com/lealone/common/logging/Logger.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.logging;
+package com.lealone.common.logging;
 
 public interface Logger {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/logging/LoggerFactory.java b/lealone-common/src/main/java/com/lealone/common/logging/LoggerFactory.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/common/logging/LoggerFactory.java
rename to lealone-common/src/main/java/com/lealone/common/logging/LoggerFactory.java
index 494d7f457..69b1643a4 100644
--- a/lealone-common/src/main/java/org/lealone/common/logging/LoggerFactory.java
+++ b/lealone-common/src/main/java/com/lealone/common/logging/LoggerFactory.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.logging;
+package com.lealone.common.logging;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.lealone.common.logging.impl.ConsoleLoggerFactory;
-import org.lealone.common.logging.impl.Log4j2LoggerFactory;
-import org.lealone.common.util.Utils;
+import com.lealone.common.logging.impl.ConsoleLoggerFactory;
+import com.lealone.common.logging.impl.Log4j2LoggerFactory;
+import com.lealone.common.util.Utils;
 
 public abstract class LoggerFactory {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/logging/impl/ConsoleLogger.java b/lealone-common/src/main/java/com/lealone/common/logging/impl/ConsoleLogger.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/logging/impl/ConsoleLogger.java
rename to lealone-common/src/main/java/com/lealone/common/logging/impl/ConsoleLogger.java
index 71bdfe5b9..e2bd8944e 100644
--- a/lealone-common/src/main/java/org/lealone/common/logging/impl/ConsoleLogger.java
+++ b/lealone-common/src/main/java/com/lealone/common/logging/impl/ConsoleLogger.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.logging.impl;
+package com.lealone.common.logging.impl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
 
 class ConsoleLogger implements Logger {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/logging/impl/ConsoleLoggerFactory.java b/lealone-common/src/main/java/com/lealone/common/logging/impl/ConsoleLoggerFactory.java
similarity index 76%
rename from lealone-common/src/main/java/org/lealone/common/logging/impl/ConsoleLoggerFactory.java
rename to lealone-common/src/main/java/com/lealone/common/logging/impl/ConsoleLoggerFactory.java
index ac9148756..49d900945 100644
--- a/lealone-common/src/main/java/org/lealone/common/logging/impl/ConsoleLoggerFactory.java
+++ b/lealone-common/src/main/java/com/lealone/common/logging/impl/ConsoleLoggerFactory.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.logging.impl;
+package com.lealone.common.logging.impl;
 
-import org.lealone.common.logging.LoggerFactory;
+import com.lealone.common.logging.LoggerFactory;
 
 public class ConsoleLoggerFactory extends LoggerFactory {
     @Override
diff --git a/lealone-common/src/main/java/org/lealone/common/logging/impl/Log4j2Logger.java b/lealone-common/src/main/java/com/lealone/common/logging/impl/Log4j2Logger.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/logging/impl/Log4j2Logger.java
rename to lealone-common/src/main/java/com/lealone/common/logging/impl/Log4j2Logger.java
index c14c5d76f..9740d5880 100644
--- a/lealone-common/src/main/java/org/lealone/common/logging/impl/Log4j2Logger.java
+++ b/lealone-common/src/main/java/com/lealone/common/logging/impl/Log4j2Logger.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.logging.impl;
+package com.lealone.common.logging.impl;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.message.FormattedMessage;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.spi.ExtendedLogger;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
 
 class Log4j2Logger implements Logger {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/logging/impl/Log4j2LoggerFactory.java b/lealone-common/src/main/java/com/lealone/common/logging/impl/Log4j2LoggerFactory.java
similarity index 76%
rename from lealone-common/src/main/java/org/lealone/common/logging/impl/Log4j2LoggerFactory.java
rename to lealone-common/src/main/java/com/lealone/common/logging/impl/Log4j2LoggerFactory.java
index 3760ab195..2717e47dc 100644
--- a/lealone-common/src/main/java/org/lealone/common/logging/impl/Log4j2LoggerFactory.java
+++ b/lealone-common/src/main/java/com/lealone/common/logging/impl/Log4j2LoggerFactory.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.logging.impl;
+package com.lealone.common.logging.impl;
 
-import org.lealone.common.logging.LoggerFactory;
+import com.lealone.common.logging.LoggerFactory;
 
 public class Log4j2LoggerFactory extends LoggerFactory {
     @Override
diff --git a/lealone-common/src/main/java/org/lealone/common/security/AES.java b/lealone-common/src/main/java/com/lealone/common/security/AES.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/security/AES.java
rename to lealone-common/src/main/java/com/lealone/common/security/AES.java
index 07d75bf71..41fc5fc36 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/AES.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/AES.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
 /**
  * An implementation of the AES block cipher algorithm,
diff --git a/lealone-common/src/main/java/org/lealone/common/security/BlockCipher.java b/lealone-common/src/main/java/com/lealone/common/security/BlockCipher.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/security/BlockCipher.java
rename to lealone-common/src/main/java/com/lealone/common/security/BlockCipher.java
index db0c1c3fe..bfa95e43e 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/BlockCipher.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/BlockCipher.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
 /**
  * A block cipher is a data encryption algorithm that operates on blocks.
diff --git a/lealone-common/src/main/java/org/lealone/common/security/CipherFactory.java b/lealone-common/src/main/java/com/lealone/common/security/CipherFactory.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/common/security/CipherFactory.java
rename to lealone-common/src/main/java/com/lealone/common/security/CipherFactory.java
index 7cd869640..c61556f79 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/CipherFactory.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/CipherFactory.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * A factory to create new block cipher objects.
diff --git a/lealone-common/src/main/java/org/lealone/common/security/EncryptionOptions.java b/lealone-common/src/main/java/com/lealone/common/security/EncryptionOptions.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/common/security/EncryptionOptions.java
rename to lealone-common/src/main/java/com/lealone/common/security/EncryptionOptions.java
index cb427363b..871880e3a 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/EncryptionOptions.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/EncryptionOptions.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
 public abstract class EncryptionOptions {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/security/Fog.java b/lealone-common/src/main/java/com/lealone/common/security/Fog.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/security/Fog.java
rename to lealone-common/src/main/java/com/lealone/common/security/Fog.java
index 7f1e33208..0557d5d10 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/Fog.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/Fog.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
-import org.lealone.common.util.Utils;
+import com.lealone.common.util.Utils;
 
 /**
  * A pseudo-encryption algorithm that makes the data appear to be
diff --git a/lealone-common/src/main/java/org/lealone/common/security/SHA256.java b/lealone-common/src/main/java/com/lealone/common/security/SHA256.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/security/SHA256.java
rename to lealone-common/src/main/java/com/lealone/common/security/SHA256.java
index 1321f501e..8f5f17642 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/SHA256.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/SHA256.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
 import java.util.Arrays;
 
diff --git a/lealone-common/src/main/java/org/lealone/common/security/XTEA.java b/lealone-common/src/main/java/com/lealone/common/security/XTEA.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/security/XTEA.java
rename to lealone-common/src/main/java/com/lealone/common/security/XTEA.java
index e1bdd0ca5..12b4c3e11 100644
--- a/lealone-common/src/main/java/org/lealone/common/security/XTEA.java
+++ b/lealone-common/src/main/java/com/lealone/common/security/XTEA.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.security;
+package com.lealone.common.security;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.SysProperties;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.SysProperties;
 
 /**
  * An implementation of the XTEA block cipher algorithm.
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/DefaultTrace.java b/lealone-common/src/main/java/com/lealone/common/trace/DefaultTrace.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/trace/DefaultTrace.java
rename to lealone-common/src/main/java/com/lealone/common/trace/DefaultTrace.java
index 62509928d..8f0340f39 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/DefaultTrace.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/DefaultTrace.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 import java.text.MessageFormat;
 
-import org.lealone.common.util.StringUtils;
+import com.lealone.common.util.StringUtils;
 
 /**
  * This class represents a default trace module.
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/DefaultTraceWriter.java b/lealone-common/src/main/java/com/lealone/common/trace/DefaultTraceWriter.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/common/trace/DefaultTraceWriter.java
rename to lealone-common/src/main/java/com/lealone/common/trace/DefaultTraceWriter.java
index a04930c32..227c95971 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/DefaultTraceWriter.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/DefaultTraceWriter.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -11,12 +11,12 @@
 import java.io.Writer;
 import java.text.SimpleDateFormat;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.exceptions.JdbcSQLException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.JdbcSQLException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * @author H2 Group
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/NoTrace.java b/lealone-common/src/main/java/com/lealone/common/trace/NoTrace.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/trace/NoTrace.java
rename to lealone-common/src/main/java/com/lealone/common/trace/NoTrace.java
index 7b8a0efbf..c86362c67 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/NoTrace.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/NoTrace.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 class NoTrace implements Trace {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/Trace.java b/lealone-common/src/main/java/com/lealone/common/trace/Trace.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/trace/Trace.java
rename to lealone-common/src/main/java/com/lealone/common/trace/Trace.java
index dfa7adfd0..515b78655 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/Trace.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/Trace.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 import java.util.ArrayList;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.value.Value;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.value.Value;
 
 /**
  * This class represents a trace module.
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/TraceModuleType.java b/lealone-common/src/main/java/com/lealone/common/trace/TraceModuleType.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/trace/TraceModuleType.java
rename to lealone-common/src/main/java/com/lealone/common/trace/TraceModuleType.java
index f6d45696a..7074fe77a 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/TraceModuleType.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/TraceModuleType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 public enum TraceModuleType {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/TraceObject.java b/lealone-common/src/main/java/com/lealone/common/trace/TraceObject.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/trace/TraceObject.java
rename to lealone-common/src/main/java/com/lealone/common/trace/TraceObject.java
index 41726e6e9..67dcf8175 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/TraceObject.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/TraceObject.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
 
 /**
  * The base class for objects that can print trace information about themselves.
@@ -262,7 +262,7 @@ protected static String quoteBytes(byte[] x) {
         if (x == null) {
             return "null";
         }
-        return "org.lealone.util.StringUtils.convertHexToBytes(\"" + StringUtils.convertBytesToHex(x)
+        return "com.lealone.util.StringUtils.convertHexToBytes(\"" + StringUtils.convertBytesToHex(x)
                 + "\")";
     }
 
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/TraceObjectType.java b/lealone-common/src/main/java/com/lealone/common/trace/TraceObjectType.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/common/trace/TraceObjectType.java
rename to lealone-common/src/main/java/com/lealone/common/trace/TraceObjectType.java
index 9f8b55ad5..51a311856 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/TraceObjectType.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/TraceObjectType.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
-import org.lealone.common.util.CamelCaseHelper;
+import com.lealone.common.util.CamelCaseHelper;
 
 public enum TraceObjectType {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/TraceSystem.java b/lealone-common/src/main/java/com/lealone/common/trace/TraceSystem.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/trace/TraceSystem.java
rename to lealone-common/src/main/java/com/lealone/common/trace/TraceSystem.java
index 1bccdc4fc..dabb91072 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/TraceSystem.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/TraceSystem.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 /**
  * The trace mechanism is the logging facility of this database. There is
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/TraceWriter.java b/lealone-common/src/main/java/com/lealone/common/trace/TraceWriter.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/trace/TraceWriter.java
rename to lealone-common/src/main/java/com/lealone/common/trace/TraceWriter.java
index 3be3d6f26..553104c91 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/TraceWriter.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/TraceWriter.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
 /**
  * The backend of the trace system must implement this interface. Two
diff --git a/lealone-common/src/main/java/org/lealone/common/trace/TraceWriterAdapter.java b/lealone-common/src/main/java/com/lealone/common/trace/TraceWriterAdapter.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/common/trace/TraceWriterAdapter.java
rename to lealone-common/src/main/java/com/lealone/common/trace/TraceWriterAdapter.java
index 08f6880ad..93addc957 100644
--- a/lealone-common/src/main/java/org/lealone/common/trace/TraceWriterAdapter.java
+++ b/lealone-common/src/main/java/com/lealone/common/trace/TraceWriterAdapter.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.trace;
+package com.lealone.common.trace;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
 
 /**
  * This adapter sends log output to SLF4J. SLF4J supports multiple
diff --git a/lealone-common/src/main/java/org/lealone/common/util/Awaiter.java b/lealone-common/src/main/java/com/lealone/common/util/Awaiter.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/common/util/Awaiter.java
rename to lealone-common/src/main/java/com/lealone/common/util/Awaiter.java
index 809f29f29..e882df4b8 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/Awaiter.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/Awaiter.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.lealone.common.logging.Logger;
+import com.lealone.common.logging.Logger;
 
 public class Awaiter {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/BitField.java b/lealone-common/src/main/java/com/lealone/common/util/BitField.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/util/BitField.java
rename to lealone-common/src/main/java/com/lealone/common/util/BitField.java
index 05a21a1ab..e6b8eec08 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/BitField.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/BitField.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 /**
  * A list of bits.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/CamelCaseHelper.java b/lealone-common/src/main/java/com/lealone/common/util/CamelCaseHelper.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/util/CamelCaseHelper.java
rename to lealone-common/src/main/java/com/lealone/common/util/CamelCaseHelper.java
index f50336fb3..0bd22c55e 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/CamelCaseHelper.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/CamelCaseHelper.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 public class CamelCaseHelper {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/CaseInsensitiveMap.java b/lealone-common/src/main/java/com/lealone/common/util/CaseInsensitiveMap.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/CaseInsensitiveMap.java
rename to lealone-common/src/main/java/com/lealone/common/util/CaseInsensitiveMap.java
index 29bd0a30c..cc88a0305 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/CaseInsensitiveMap.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/CaseInsensitiveMap.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/lealone-common/src/main/java/org/lealone/common/util/DataUtils.java b/lealone-common/src/main/java/com/lealone/common/util/DataUtils.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/util/DataUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/DataUtils.java
index cb921a39a..aff312bec 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/DataUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/DataUtils.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -18,7 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.lealone.db.Constants;
+import com.lealone.db.Constants;
 
 /**
  * Utility methods
diff --git a/lealone-common/src/main/java/org/lealone/common/util/DateTimeUtils.java b/lealone-common/src/main/java/com/lealone/common/util/DateTimeUtils.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/DateTimeUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/DateTimeUtils.java
index 31e21ad1c..d94c7441f 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/DateTimeUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/DateTimeUtils.java
@@ -5,7 +5,7 @@
  * Iso8601:
  * Initial Developer: Robert Rathsack (firstName dot lastName at gmx dot de)
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.sql.Date;
 import java.sql.Time;
@@ -16,13 +16,13 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
 
 /**
  * This utility class contains time conversion functions.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/ExpiringMap.java b/lealone-common/src/main/java/com/lealone/common/util/ExpiringMap.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/common/util/ExpiringMap.java
rename to lealone-common/src/main/java/com/lealone/common/util/ExpiringMap.java
index f82171f73..664946a5c 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/ExpiringMap.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/ExpiringMap.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,12 +12,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncPeriodicTask;
-import org.lealone.db.async.AsyncTaskHandler;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncPeriodicTask;
+import com.lealone.db.async.AsyncTaskHandler;
 
 public class ExpiringMap {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/IOUtils.java b/lealone-common/src/main/java/com/lealone/common/util/IOUtils.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/IOUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/IOUtils.java
index 4177ddf6b..1ef51e5c6 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/IOUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/IOUtils.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -20,10 +20,10 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * This utility class contains input/output functions.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/JdbcUtils.java b/lealone-common/src/main/java/com/lealone/common/util/JdbcUtils.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/common/util/JdbcUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/JdbcUtils.java
index cb6f018f5..ccb985513 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/JdbcUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/JdbcUtils.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 /**
  * This is a utility class with JDBC helper functions.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/MapUtils.java b/lealone-common/src/main/java/com/lealone/common/util/MapUtils.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/MapUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/MapUtils.java
index d23411561..1f3b14de1 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/MapUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/MapUtils.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.util.Map;
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/MathUtils.java b/lealone-common/src/main/java/com/lealone/common/util/MathUtils.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/util/MathUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/MathUtils.java
index 410656787..0464f7294 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/MathUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/MathUtils.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
diff --git a/lealone-common/src/main/java/org/lealone/common/util/ScriptReader.java b/lealone-common/src/main/java/com/lealone/common/util/ScriptReader.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/ScriptReader.java
rename to lealone-common/src/main/java/com/lealone/common/util/ScriptReader.java
index b07b9078e..ddec77545 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/ScriptReader.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/ScriptReader.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Arrays;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
 
 /**
  * This class can split SQL scripts to single SQL statements.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/ShutdownHookUtils.java b/lealone-common/src/main/java/com/lealone/common/util/ShutdownHookUtils.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/util/ShutdownHookUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/ShutdownHookUtils.java
index 786825095..c03e33380 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/ShutdownHookUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/ShutdownHookUtils.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.util.HashSet;
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/SmallLRUCache.java b/lealone-common/src/main/java/com/lealone/common/util/SmallLRUCache.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/common/util/SmallLRUCache.java
rename to lealone-common/src/main/java/com/lealone/common/util/SmallLRUCache.java
index 7e93983f2..87c93154e 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/SmallLRUCache.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/SmallLRUCache.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/lealone-common/src/main/java/org/lealone/common/util/SortedProperties.java b/lealone-common/src/main/java/com/lealone/common/util/SortedProperties.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/common/util/SortedProperties.java
rename to lealone-common/src/main/java/com/lealone/common/util/SortedProperties.java
index c2db8d7f3..90053425c 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/SortedProperties.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/SortedProperties.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -18,13 +18,14 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map.Entry;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.storage.fs.FileUtils;
+
 import java.util.Properties;
 import java.util.TreeMap;
 import java.util.Vector;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.storage.fs.FileUtils;
-
 /**
  * Sorted properties file.
  * This implementation requires that store() internally calls keys().
diff --git a/lealone-common/src/main/java/org/lealone/common/util/StatementBuilder.java b/lealone-common/src/main/java/com/lealone/common/util/StatementBuilder.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/StatementBuilder.java
rename to lealone-common/src/main/java/com/lealone/common/util/StatementBuilder.java
index 3f2df06df..cdbd69a98 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/StatementBuilder.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/StatementBuilder.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 /**
  * A utility class to build a statement. In addition to the methods supported by
diff --git a/lealone-common/src/main/java/org/lealone/common/util/StringUtils.java b/lealone-common/src/main/java/com/lealone/common/util/StringUtils.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/util/StringUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/StringUtils.java
index c786c66a1..ab792cffa 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/StringUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/StringUtils.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.lang.ref.SoftReference;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * A few String utility functions.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/SystemPropertyUtils.java b/lealone-common/src/main/java/com/lealone/common/util/SystemPropertyUtils.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/common/util/SystemPropertyUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/SystemPropertyUtils.java
index 0bca7c406..e156cf366 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/SystemPropertyUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/SystemPropertyUtils.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 public class SystemPropertyUtils {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/Task.java b/lealone-common/src/main/java/com/lealone/common/util/Task.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/common/util/Task.java
rename to lealone-common/src/main/java/com/lealone/common/util/Task.java
index e3177daaf..e569fa84f 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/Task.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/Task.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 /**
  * A method call that is executed in a separate thread. If the method throws an
diff --git a/lealone-common/src/main/java/org/lealone/common/util/TempFileDeleter.java b/lealone-common/src/main/java/com/lealone/common/util/TempFileDeleter.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/common/util/TempFileDeleter.java
rename to lealone-common/src/main/java/com/lealone/common/util/TempFileDeleter.java
index 67f39a205..dbe07c89a 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/TempFileDeleter.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/TempFileDeleter.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
@@ -11,9 +11,9 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.SysProperties;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.SysProperties;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * This class deletes temporary files when they are not used any longer.
diff --git a/lealone-common/src/main/java/org/lealone/common/util/ThreadUtils.java b/lealone-common/src/main/java/com/lealone/common/util/ThreadUtils.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/common/util/ThreadUtils.java
rename to lealone-common/src/main/java/com/lealone/common/util/ThreadUtils.java
index 395a69cf5..480d87b5d 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/ThreadUtils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/ThreadUtils.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 public class ThreadUtils {
 
diff --git a/lealone-common/src/main/java/org/lealone/common/util/Utils.java b/lealone-common/src/main/java/com/lealone/common/util/Utils.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/common/util/Utils.java
rename to lealone-common/src/main/java/com/lealone/common/util/Utils.java
index 2ef962101..74b3d0aa0 100644
--- a/lealone-common/src/main/java/org/lealone/common/util/Utils.java
+++ b/lealone-common/src/main/java/com/lealone/common/util/Utils.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.common.util;
+package com.lealone.common.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,12 +28,12 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.lealone.common.exceptions.ConfigException;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.JavaObjectSerializer;
+import com.lealone.common.exceptions.ConfigException;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.JavaObjectSerializer;
 
 /**
  * This utility class contains miscellaneous functions.
diff --git a/lealone-common/src/main/java/org/lealone/db/Command.java b/lealone-common/src/main/java/com/lealone/db/Command.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/Command.java
rename to lealone-common/src/main/java/com/lealone/db/Command.java
index e6fa1c9b6..ec0b5c4e6 100644
--- a/lealone-common/src/main/java/org/lealone/db/Command.java
+++ b/lealone-common/src/main/java/com/lealone/db/Command.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 /**
  * Represents a command.
diff --git a/lealone-common/src/main/java/org/lealone/db/CommandParameter.java b/lealone-common/src/main/java/com/lealone/db/CommandParameter.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/db/CommandParameter.java
rename to lealone-common/src/main/java/com/lealone/db/CommandParameter.java
index 1e5a8377c..d651259a3 100644
--- a/lealone-common/src/main/java/org/lealone/db/CommandParameter.java
+++ b/lealone-common/src/main/java/com/lealone/db/CommandParameter.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.value.Value;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.value.Value;
 
 /**
  * The interface for client side and server side parameters.
diff --git a/lealone-common/src/main/java/org/lealone/db/ConnectionInfo.java b/lealone-common/src/main/java/com/lealone/db/ConnectionInfo.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/ConnectionInfo.java
rename to lealone-common/src/main/java/com/lealone/db/ConnectionInfo.java
index b1142c03f..11b67b658 100644
--- a/lealone-common/src/main/java/org/lealone/db/ConnectionInfo.java
+++ b/lealone-common/src/main/java/com/lealone/db/ConnectionInfo.java
@@ -3,27 +3,28 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map.Entry;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.SortedProperties;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.Session;
+import com.lealone.db.session.SessionFactory;
+import com.lealone.db.session.SessionSetting;
+import com.lealone.storage.fs.impl.encrypt.FilePathEncrypt;
+
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.SortedProperties;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.Session;
-import org.lealone.db.session.SessionFactory;
-import org.lealone.db.session.SessionSetting;
-import org.lealone.storage.fs.impl.encrypt.FilePathEncrypt;
-
 /**
  * Encapsulates the connection settings, including user name and password.
  * 
diff --git a/lealone-common/src/main/java/org/lealone/db/ConnectionSetting.java b/lealone-common/src/main/java/com/lealone/db/ConnectionSetting.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/ConnectionSetting.java
rename to lealone-common/src/main/java/com/lealone/db/ConnectionSetting.java
index 0c63622f4..04530cca2 100644
--- a/lealone-common/src/main/java/org/lealone/db/ConnectionSetting.java
+++ b/lealone-common/src/main/java/com/lealone/db/ConnectionSetting.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 public enum ConnectionSetting {
     IGNORE_UNKNOWN_SETTINGS,
diff --git a/lealone-common/src/main/java/org/lealone/db/Constants.java b/lealone-common/src/main/java/com/lealone/db/Constants.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/Constants.java
rename to lealone-common/src/main/java/com/lealone/db/Constants.java
index f2f8cb177..2a99f87a8 100644
--- a/lealone-common/src/main/java/org/lealone/db/Constants.java
+++ b/lealone-common/src/main/java/com/lealone/db/Constants.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.io.File;
 import java.nio.charset.Charset;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
 
 /**
  * Constants are fixed values that are used in the whole database code.
@@ -52,7 +52,7 @@ private Constants() {
 
     public static final char NAME_SEPARATOR = '_';
 
-    public static final String RESOURCES_DIR = "/org/lealone/common/resources/";
+    public static final String RESOURCES_DIR = "/com/lealone/common/resources/";
 
     /**
      * The TCP protocol version number 1.
@@ -313,7 +313,7 @@ private Constants() {
     /**
      * The package name of user defined classes.
      */
-    public static final String USER_PACKAGE = "org.lealone.dynamic";
+    public static final String USER_PACKAGE = "com.lealone.dynamic";
 
     /**
      * Name of the character encoding format.
@@ -339,7 +339,7 @@ private Constants() {
     public static final boolean IS_WINDOWS = System.getProperty("os.name").startsWith("Windows");
 
     // 为了避免模块之间在编译期存在依赖，有些地方会用到反射，在这里统一定义类名
-    public static final String REFLECTION_JDBC_CONNECTION = "org.lealone.client.jdbc.JdbcConnection";
+    public static final String REFLECTION_JDBC_CONNECTION = "com.lealone.client.jdbc.JdbcConnection";
 
     /**
      * The major version of this database.
diff --git a/lealone-common/src/main/java/org/lealone/db/DataBuffer.java b/lealone-common/src/main/java/com/lealone/db/DataBuffer.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/DataBuffer.java
rename to lealone-common/src/main/java/com/lealone/db/DataBuffer.java
index 16f1ae0b4..ff3c1b181 100644
--- a/lealone-common/src/main/java/org/lealone/db/DataBuffer.java
+++ b/lealone-common/src/main/java/com/lealone/db/DataBuffer.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -15,43 +15,44 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SimpleResultSet;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueEnum;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueJavaObject;
-import org.lealone.db.value.ValueList;
-import org.lealone.db.value.ValueLob;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueMap;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.db.value.ValueSet;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueStringFixed;
-import org.lealone.db.value.ValueStringIgnoreCase;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
-import org.lealone.storage.type.StorageDataType;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SimpleResultSet;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueEnum;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueJavaObject;
+import com.lealone.db.value.ValueList;
+import com.lealone.db.value.ValueLob;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueMap;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.db.value.ValueSet;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueStringFixed;
+import com.lealone.db.value.ValueStringIgnoreCase;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
+import com.lealone.storage.type.StorageDataType;
+import com.lealone.storage.type.StorageDataTypeBase;
+
+import java.util.Set;
 
 /**
  * @author H2 Group
diff --git a/lealone-common/src/main/java/org/lealone/db/DataBufferFactory.java b/lealone-common/src/main/java/com/lealone/db/DataBufferFactory.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/db/DataBufferFactory.java
rename to lealone-common/src/main/java/com/lealone/db/DataBufferFactory.java
index 5777d75e6..092840f8a 100644
--- a/lealone-common/src/main/java/org/lealone/db/DataBufferFactory.java
+++ b/lealone-common/src/main/java/com/lealone/db/DataBufferFactory.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/lealone-common/src/main/java/org/lealone/db/DataHandler.java b/lealone-common/src/main/java/com/lealone/db/DataHandler.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/db/DataHandler.java
rename to lealone-common/src/main/java/com/lealone/db/DataHandler.java
index 4428d94b1..61338bc16 100644
--- a/lealone-common/src/main/java/org/lealone/db/DataHandler.java
+++ b/lealone-common/src/main/java/com/lealone/db/DataHandler.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.TempFileDeleter;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.lob.LobStorage;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.TempFileDeleter;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.lob.LobStorage;
 
 /**
  * A data handler contains a number of callback methods.
diff --git a/lealone-common/src/main/java/org/lealone/db/DbSetting.java b/lealone-common/src/main/java/com/lealone/db/DbSetting.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/db/DbSetting.java
rename to lealone-common/src/main/java/com/lealone/db/DbSetting.java
index 7ca3b0b83..d5416d0df 100644
--- a/lealone-common/src/main/java/org/lealone/db/DbSetting.java
+++ b/lealone-common/src/main/java/com/lealone/db/DbSetting.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.HashSet;
 
diff --git a/lealone-common/src/main/java/org/lealone/db/LocalDataHandler.java b/lealone-common/src/main/java/com/lealone/db/LocalDataHandler.java
similarity index 80%
rename from lealone-common/src/main/java/org/lealone/db/LocalDataHandler.java
rename to lealone-common/src/main/java/com/lealone/db/LocalDataHandler.java
index e66d872d1..b758490a9 100644
--- a/lealone-common/src/main/java/org/lealone/db/LocalDataHandler.java
+++ b/lealone-common/src/main/java/com/lealone/db/LocalDataHandler.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.TempFileDeleter;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.fs.FileUtils;
-import org.lealone.storage.lob.LobLocalStorage;
-import org.lealone.storage.lob.LobLocalStorage.LobReader;
-import org.lealone.storage.lob.LobStorage;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.TempFileDeleter;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.fs.FileUtils;
+import com.lealone.storage.lob.LobLocalStorage;
+import com.lealone.storage.lob.LobStorage;
+import com.lealone.storage.lob.LobLocalStorage.LobReader;
 
 public class LocalDataHandler implements DataHandler {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/ManualCloseable.java b/lealone-common/src/main/java/com/lealone/db/ManualCloseable.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/db/ManualCloseable.java
rename to lealone-common/src/main/java/com/lealone/db/ManualCloseable.java
index 449ac1d06..340c8e441 100644
--- a/lealone-common/src/main/java/org/lealone/db/ManualCloseable.java
+++ b/lealone-common/src/main/java/com/lealone/db/ManualCloseable.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 //有些命令不必非得调用close，避免加@SuppressWarnings("resource")
 public interface ManualCloseable {
diff --git a/lealone-common/src/main/java/org/lealone/db/MemoryManager.java b/lealone-common/src/main/java/com/lealone/db/MemoryManager.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/MemoryManager.java
rename to lealone-common/src/main/java/com/lealone/db/MemoryManager.java
index 059faa30e..00dd8a727 100644
--- a/lealone-common/src/main/java/org/lealone/db/MemoryManager.java
+++ b/lealone-common/src/main/java/com/lealone/db/MemoryManager.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryUsage;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.lealone.common.util.SystemPropertyUtils;
+import com.lealone.common.util.SystemPropertyUtils;
 
 public class MemoryManager {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/PluggableEngine.java b/lealone-common/src/main/java/com/lealone/db/PluggableEngine.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/db/PluggableEngine.java
rename to lealone-common/src/main/java/com/lealone/db/PluggableEngine.java
index 2fce3df3b..328ea7818 100644
--- a/lealone-common/src/main/java/org/lealone/db/PluggableEngine.java
+++ b/lealone-common/src/main/java/com/lealone/db/PluggableEngine.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 //4大引擎的标记接口
 public interface PluggableEngine extends Plugin {
diff --git a/lealone-common/src/main/java/org/lealone/db/Plugin.java b/lealone-common/src/main/java/com/lealone/db/Plugin.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/Plugin.java
rename to lealone-common/src/main/java/com/lealone/db/Plugin.java
index c22da7314..a02610ae8 100644
--- a/lealone-common/src/main/java/org/lealone/db/Plugin.java
+++ b/lealone-common/src/main/java/com/lealone/db/Plugin.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.Map;
 
diff --git a/lealone-common/src/main/java/org/lealone/db/PluginBase.java b/lealone-common/src/main/java/com/lealone/db/PluginBase.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/PluginBase.java
rename to lealone-common/src/main/java/com/lealone/db/PluginBase.java
index 6c1ffa610..a21778e01 100644
--- a/lealone-common/src/main/java/org/lealone/db/PluginBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/PluginBase.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.Map;
 
-import org.lealone.common.util.MapUtils;
+import com.lealone.common.util.MapUtils;
 
 public abstract class PluginBase implements Plugin {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/PluginManager.java b/lealone-common/src/main/java/com/lealone/db/PluginManager.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/PluginManager.java
rename to lealone-common/src/main/java/com/lealone/db/PluginManager.java
index 3f35cd8ca..011568fbe 100644
--- a/lealone-common/src/main/java/org/lealone/db/PluginManager.java
+++ b/lealone-common/src/main/java/com/lealone/db/PluginManager.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -11,8 +11,8 @@
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
 
 public class PluginManager {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/RunMode.java b/lealone-common/src/main/java/com/lealone/db/RunMode.java
similarity index 79%
rename from lealone-common/src/main/java/org/lealone/db/RunMode.java
rename to lealone-common/src/main/java/com/lealone/db/RunMode.java
index 5c030ce09..05cc2914e 100644
--- a/lealone-common/src/main/java/org/lealone/db/RunMode.java
+++ b/lealone-common/src/main/java/com/lealone/db/RunMode.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.Map;
 
-import org.lealone.common.util.MapUtils;
-import org.lealone.common.util.SystemPropertyUtils;
+import com.lealone.common.util.MapUtils;
+import com.lealone.common.util.SystemPropertyUtils;
 
 public enum RunMode {
     EMBEDDED,
diff --git a/lealone-common/src/main/java/org/lealone/db/SysProperties.java b/lealone-common/src/main/java/com/lealone/db/SysProperties.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/db/SysProperties.java
rename to lealone-common/src/main/java/com/lealone/db/SysProperties.java
index 03add77b8..3877cc971 100644
--- a/lealone-common/src/main/java/org/lealone/db/SysProperties.java
+++ b/lealone-common/src/main/java/com/lealone/db/SysProperties.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * The constants defined in this class are initialized from system properties.
diff --git a/lealone-common/src/main/java/org/lealone/db/api/Aggregate.java b/lealone-common/src/main/java/com/lealone/db/api/Aggregate.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/api/Aggregate.java
rename to lealone-common/src/main/java/com/lealone/db/api/Aggregate.java
index 8001d38c8..922c4daeb 100644
--- a/lealone-common/src/main/java/org/lealone/db/api/Aggregate.java
+++ b/lealone-common/src/main/java/com/lealone/db/api/Aggregate.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.api;
+package com.lealone.db.api;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public interface Aggregate {
     void init(Connection conn) throws SQLException;
 
     /**
-     * This method must return the lealone data type, {@link org.lealone.db.value.Value},
+     * This method must return the lealone data type, {@link com.lealone.db.value.Value},
      * of the aggregate function, given the lealone data type of the input data.
      * The method should check here if the number of parameters
      * passed is correct, and if not it should throw an exception.
diff --git a/lealone-common/src/main/java/org/lealone/db/api/DatabaseEventListener.java b/lealone-common/src/main/java/com/lealone/db/api/DatabaseEventListener.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/db/api/DatabaseEventListener.java
rename to lealone-common/src/main/java/com/lealone/db/api/DatabaseEventListener.java
index a18c27940..76dc3832c 100644
--- a/lealone-common/src/main/java/org/lealone/db/api/DatabaseEventListener.java
+++ b/lealone-common/src/main/java/com/lealone/db/api/DatabaseEventListener.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.api;
+package com.lealone.db.api;
 
 import java.sql.SQLException;
 import java.util.EventListener;
diff --git a/lealone-common/src/main/java/org/lealone/db/api/ErrorCode.java b/lealone-common/src/main/java/com/lealone/db/api/ErrorCode.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/db/api/ErrorCode.java
rename to lealone-common/src/main/java/com/lealone/db/api/ErrorCode.java
index 6df971446..1b64d3aff 100644
--- a/lealone-common/src/main/java/org/lealone/db/api/ErrorCode.java
+++ b/lealone-common/src/main/java/com/lealone/db/api/ErrorCode.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.api;
+package com.lealone.db.api;
 
 /**
  * This class defines the error codes used for SQL exceptions.
@@ -719,7 +719,7 @@ public class ErrorCode {
      * The error with code 90030 is thrown when
      * the database engine has detected a checksum mismatch in the data
      * or index. To solve this problem, restore a backup or use the
-     * Recovery tool (org.lealone.tools.Recover).
+     * Recovery tool (com.lealone.tools.Recover).
      */
     public static final int FILE_CORRUPTED_1 = 90030;
 
@@ -823,9 +823,9 @@ public class ErrorCode {
      * 
      * CREATE TABLE TEST(ID INT);
      * CREATE TRIGGER TRIGGER_A AFTER INSERT ON TEST
-     *      CALL "org.lealone.samples.TriggerSample$MyTrigger";
+     *      CALL "com.lealone.samples.TriggerSample$MyTrigger";
      * CREATE TRIGGER TRIGGER_A AFTER INSERT ON TEST
-     *      CALL "org.lealone.samples.TriggerSample$MyTrigger";
+     *      CALL "com.lealone.samples.TriggerSample$MyTrigger";
      * 

      */
     public static final int TRIGGER_ALREADY_EXISTS_1 = 90041;
@@ -1634,7 +1634,7 @@ public class ErrorCode {
      * connections are not allowed. To allow remote connections,
      * start the TCP server using the option -tcpAllowOthers as in:
      * 
-     * java org.lealone.tools.Server -tcp -tcpAllowOthers
+     * java com.lealone.tools.Server -tcp -tcpAllowOthers
      * 

      * Or, when starting the server from an application, use:
      * 
diff --git a/lealone-common/src/main/java/org/lealone/db/api/JavaObjectSerializer.java b/lealone-common/src/main/java/com/lealone/db/api/JavaObjectSerializer.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/api/JavaObjectSerializer.java
rename to lealone-common/src/main/java/com/lealone/db/api/JavaObjectSerializer.java
index 121110840..9aa297afd 100644
--- a/lealone-common/src/main/java/org/lealone/db/api/JavaObjectSerializer.java
+++ b/lealone-common/src/main/java/com/lealone/db/api/JavaObjectSerializer.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.api;
+package com.lealone.db.api;
 
 /**
  * Custom serialization mechanism for java objects being stored in column of
diff --git a/lealone-common/src/main/java/org/lealone/db/api/Trigger.java b/lealone-common/src/main/java/com/lealone/db/api/Trigger.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/db/api/Trigger.java
rename to lealone-common/src/main/java/com/lealone/db/api/Trigger.java
index 126fcdf15..cbe2bee2e 100644
--- a/lealone-common/src/main/java/org/lealone/db/api/Trigger.java
+++ b/lealone-common/src/main/java/com/lealone/db/api/Trigger.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.api;
+package com.lealone.db.api;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/lealone-common/src/main/java/org/lealone/db/async/AsyncCallback.java b/lealone-common/src/main/java/com/lealone/db/async/AsyncCallback.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/db/async/AsyncCallback.java
rename to lealone-common/src/main/java/com/lealone/db/async/AsyncCallback.java
index a901f956b..ae941f468 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/AsyncCallback.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/AsyncCallback.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.net.NetInputStream;
-import org.lealone.server.protocol.Packet;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.net.NetInputStream;
+import com.lealone.server.protocol.Packet;
 
 public abstract class AsyncCallback implements Future {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/AsyncHandler.java b/lealone-common/src/main/java/com/lealone/db/async/AsyncHandler.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/db/async/AsyncHandler.java
rename to lealone-common/src/main/java/com/lealone/db/async/AsyncHandler.java
index 42f8ebaf7..c022487fd 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/AsyncHandler.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/AsyncHandler.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 public interface AsyncHandler {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/AsyncPeriodicTask.java b/lealone-common/src/main/java/com/lealone/db/async/AsyncPeriodicTask.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/async/AsyncPeriodicTask.java
rename to lealone-common/src/main/java/com/lealone/db/async/AsyncPeriodicTask.java
index 8686e136f..02ed9c83d 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/AsyncPeriodicTask.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/AsyncPeriodicTask.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
-import org.lealone.db.link.LinkableBase;
+import com.lealone.db.link.LinkableBase;
 
 public class AsyncPeriodicTask extends LinkableBase implements AsyncTask {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/AsyncResult.java b/lealone-common/src/main/java/com/lealone/db/async/AsyncResult.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/async/AsyncResult.java
rename to lealone-common/src/main/java/com/lealone/db/async/AsyncResult.java
index 145d39f10..cbe3c8155 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/AsyncResult.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/AsyncResult.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 public class AsyncResult {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/AsyncTask.java b/lealone-common/src/main/java/com/lealone/db/async/AsyncTask.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/db/async/AsyncTask.java
rename to lealone-common/src/main/java/com/lealone/db/async/AsyncTask.java
index 044d0a4fd..5624bc58c 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/AsyncTask.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/AsyncTask.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 public interface AsyncTask extends Runnable {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/AsyncTaskHandler.java b/lealone-common/src/main/java/com/lealone/db/async/AsyncTaskHandler.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/async/AsyncTaskHandler.java
rename to lealone-common/src/main/java/com/lealone/db/async/AsyncTaskHandler.java
index ff310ad68..b280e6025 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/AsyncTaskHandler.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/AsyncTaskHandler.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 public interface AsyncTaskHandler extends AsyncHandler {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/ConcurrentAsyncCallback.java b/lealone-common/src/main/java/com/lealone/db/async/ConcurrentAsyncCallback.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/async/ConcurrentAsyncCallback.java
rename to lealone-common/src/main/java/com/lealone/db/async/ConcurrentAsyncCallback.java
index 35c70e06b..4f3e0943b 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/ConcurrentAsyncCallback.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/ConcurrentAsyncCallback.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerThread;
-import org.lealone.net.NetInputStream;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerThread;
+import com.lealone.net.NetInputStream;
 
 public class ConcurrentAsyncCallback extends AsyncCallback {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/FailedFuture.java b/lealone-common/src/main/java/com/lealone/db/async/FailedFuture.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/db/async/FailedFuture.java
rename to lealone-common/src/main/java/com/lealone/db/async/FailedFuture.java
index d659f17ca..28ccdf02b 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/FailedFuture.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/FailedFuture.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
-import org.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.DbException;
 
 class FailedFuture implements Future {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/Future.java b/lealone-common/src/main/java/com/lealone/db/async/Future.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/async/Future.java
rename to lealone-common/src/main/java/com/lealone/db/async/Future.java
index a1c965e5b..f2a314fe8 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/Future.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/Future.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 public interface Future {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/async/SingleThreadAsyncCallback.java b/lealone-common/src/main/java/com/lealone/db/async/SingleThreadAsyncCallback.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/async/SingleThreadAsyncCallback.java
rename to lealone-common/src/main/java/com/lealone/db/async/SingleThreadAsyncCallback.java
index 068db3740..08645f23e 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/SingleThreadAsyncCallback.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/SingleThreadAsyncCallback.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerThread;
-import org.lealone.net.NetInputStream;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerThread;
+import com.lealone.net.NetInputStream;
 
 // 回调函数都在单线程中执行，也就是在当前调度线程中执行，可以优化回调的整个过程
 public class SingleThreadAsyncCallback extends AsyncCallback {
diff --git a/lealone-common/src/main/java/org/lealone/db/async/SucceededFuture.java b/lealone-common/src/main/java/com/lealone/db/async/SucceededFuture.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/async/SucceededFuture.java
rename to lealone-common/src/main/java/com/lealone/db/async/SucceededFuture.java
index aa4b05842..1da103bc7 100644
--- a/lealone-common/src/main/java/org/lealone/db/async/SucceededFuture.java
+++ b/lealone-common/src/main/java/com/lealone/db/async/SucceededFuture.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.async;
+package com.lealone.db.async;
 
 class SucceededFuture implements Future {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/link/Linkable.java b/lealone-common/src/main/java/com/lealone/db/link/Linkable.java
similarity index 88%
rename from lealone-common/src/main/java/org/lealone/db/link/Linkable.java
rename to lealone-common/src/main/java/com/lealone/db/link/Linkable.java
index 22c8fcd0b..353d2e759 100644
--- a/lealone-common/src/main/java/org/lealone/db/link/Linkable.java
+++ b/lealone-common/src/main/java/com/lealone/db/link/Linkable.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.link;
+package com.lealone.db.link;
 
 public interface Linkable> {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/link/LinkableBase.java b/lealone-common/src/main/java/com/lealone/db/link/LinkableBase.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/link/LinkableBase.java
rename to lealone-common/src/main/java/com/lealone/db/link/LinkableBase.java
index 81542a8fb..dd0e30417 100644
--- a/lealone-common/src/main/java/org/lealone/db/link/LinkableBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/link/LinkableBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.link;
+package com.lealone.db.link;
 
 public class LinkableBase> implements Linkable {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/link/LinkableList.java b/lealone-common/src/main/java/com/lealone/db/link/LinkableList.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/db/link/LinkableList.java
rename to lealone-common/src/main/java/com/lealone/db/link/LinkableList.java
index fe99258d4..4a3fd80ef 100644
--- a/lealone-common/src/main/java/org/lealone/db/link/LinkableList.java
+++ b/lealone-common/src/main/java/com/lealone/db/link/LinkableList.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.link;
+package com.lealone.db.link;
 
 //为调度线程量身订做的链表
 public class LinkableList> {
diff --git a/lealone-common/src/main/java/org/lealone/db/result/Result.java b/lealone-common/src/main/java/com/lealone/db/result/Result.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/result/Result.java
rename to lealone-common/src/main/java/com/lealone/db/result/Result.java
index 9358dfe6d..c53aa616c 100644
--- a/lealone-common/src/main/java/org/lealone/db/result/Result.java
+++ b/lealone-common/src/main/java/com/lealone/db/result/Result.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.db.ManualCloseable;
-import org.lealone.db.value.Value;
+import com.lealone.db.ManualCloseable;
+import com.lealone.db.value.Value;
 
 /**
  * The result interface is used by the LocalResult and ClientResult class.
diff --git a/lealone-common/src/main/java/org/lealone/db/result/SimpleResultSet.java b/lealone-common/src/main/java/com/lealone/db/result/SimpleResultSet.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/db/result/SimpleResultSet.java
rename to lealone-common/src/main/java/com/lealone/db/result/SimpleResultSet.java
index 7ecb5aada..23acfefdc 100644
--- a/lealone-common/src/main/java/org/lealone/db/result/SimpleResultSet.java
+++ b/lealone-common/src/main/java/com/lealone/db/result/SimpleResultSet.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -29,11 +29,11 @@
 import java.util.Calendar;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.value.DataType;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.value.DataType;
 
 /**
  * This class is a simple result set and meta data implementation.
diff --git a/lealone-common/src/main/java/org/lealone/db/result/SimpleRowSource.java b/lealone-common/src/main/java/com/lealone/db/result/SimpleRowSource.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/result/SimpleRowSource.java
rename to lealone-common/src/main/java/com/lealone/db/result/SimpleRowSource.java
index 68485aa6f..cbdf2d8a4 100644
--- a/lealone-common/src/main/java/org/lealone/db/result/SimpleRowSource.java
+++ b/lealone-common/src/main/java/com/lealone/db/result/SimpleRowSource.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 import java.sql.SQLException;
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/EmbeddedScheduler.java b/lealone-common/src/main/java/com/lealone/db/scheduler/EmbeddedScheduler.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/EmbeddedScheduler.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/EmbeddedScheduler.java
index 3e570b08c..5eb52d60c 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/EmbeddedScheduler.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/EmbeddedScheduler.java
@@ -3,25 +3,25 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.Awaiter;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.async.AsyncTask;
-import org.lealone.db.link.LinkableBase;
-import org.lealone.db.link.LinkableList;
-import org.lealone.db.session.Session;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
-import org.lealone.storage.page.PageOperation;
-import org.lealone.storage.page.PageOperation.PageOperationResult;
-import org.lealone.transaction.PendingTransaction;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.Awaiter;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.async.AsyncTask;
+import com.lealone.db.link.LinkableBase;
+import com.lealone.db.link.LinkableList;
+import com.lealone.db.session.Session;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
+import com.lealone.storage.page.PageOperation;
+import com.lealone.storage.page.PageOperation.PageOperationResult;
+import com.lealone.transaction.PendingTransaction;
 
 public class EmbeddedScheduler extends SchedulerBase {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/Scheduler.java b/lealone-common/src/main/java/com/lealone/db/scheduler/Scheduler.java
similarity index 80%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/Scheduler.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/Scheduler.java
index c65b6a5a3..5ea87f1ef 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/Scheduler.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/Scheduler.java
@@ -3,21 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.async.AsyncTaskHandler;
-import org.lealone.db.session.Session;
-import org.lealone.server.ProtocolServer;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.page.PageOperation;
-import org.lealone.transaction.PendingTransaction;
+import com.lealone.common.logging.Logger;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.async.AsyncTaskHandler;
+import com.lealone.db.session.Session;
+import com.lealone.server.ProtocolServer;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.page.PageOperation;
+import com.lealone.transaction.PendingTransaction;
 
 public interface Scheduler extends AsyncTaskHandler, Runnable, SchedulerListener.Factory {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerBase.java b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerBase.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerBase.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerBase.java
index 4e4ae9d0c..20afa5e51 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
@@ -13,19 +13,19 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import org.lealone.common.util.MapUtils;
-import org.lealone.common.util.ShutdownHookUtils;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.RunMode;
-import org.lealone.db.async.AsyncPeriodicTask;
-import org.lealone.db.async.AsyncTask;
-import org.lealone.db.link.LinkableList;
-import org.lealone.db.session.Session;
-import org.lealone.server.ProtocolServer;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.page.PageOperation;
-import org.lealone.transaction.PendingTransaction;
+import com.lealone.common.util.MapUtils;
+import com.lealone.common.util.ShutdownHookUtils;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.RunMode;
+import com.lealone.db.async.AsyncPeriodicTask;
+import com.lealone.db.async.AsyncTask;
+import com.lealone.db.link.LinkableList;
+import com.lealone.db.session.Session;
+import com.lealone.server.ProtocolServer;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.page.PageOperation;
+import com.lealone.transaction.PendingTransaction;
 
 public abstract class SchedulerBase implements Scheduler {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerFactory.java b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerFactory.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerFactory.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerFactory.java
index 0d00dfd6a..c65bd0a5d 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerFactory.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerFactory.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.util.Map;
 
-import org.lealone.db.Plugin;
+import com.lealone.db.Plugin;
 
 public interface SchedulerFactory extends Plugin {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerFactoryBase.java b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerFactoryBase.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerFactoryBase.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerFactoryBase.java
index d5164fc3a..4695fb5ee 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerFactoryBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerFactoryBase.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.MapUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
-import org.lealone.db.PluginManager;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.MapUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
+import com.lealone.db.PluginManager;
 
 public abstract class SchedulerFactoryBase extends PluginBase implements SchedulerFactory {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerListener.java b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerListener.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerListener.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerListener.java
index 6349d155d..758cbe7f1 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerListener.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerListener.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
 
 public abstract class SchedulerListener implements AsyncHandler> {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerLock.java b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerLock.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerLock.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerLock.java
index 36be1c4d4..e82038265 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerLock.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerLock.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
diff --git a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerThread.java b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerThread.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerThread.java
rename to lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerThread.java
index a7a7d908b..f7e0280ca 100644
--- a/lealone-common/src/main/java/org/lealone/db/scheduler/SchedulerThread.java
+++ b/lealone-common/src/main/java/com/lealone/db/scheduler/SchedulerThread.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.scheduler;
+package com.lealone.db.scheduler;
 
-import org.lealone.db.session.Session;
+import com.lealone.db.session.Session;
 
 public class SchedulerThread extends Thread {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/session/DelegatedSession.java b/lealone-common/src/main/java/com/lealone/db/session/DelegatedSession.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/db/session/DelegatedSession.java
rename to lealone-common/src/main/java/com/lealone/db/session/DelegatedSession.java
index 32faa9b18..ee1cabeae 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/DelegatedSession.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/DelegatedSession.java
@@ -3,22 +3,22 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
-
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.DataHandler;
-import org.lealone.db.RunMode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.AckPacketHandler;
-import org.lealone.server.protocol.Packet;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
-import org.lealone.sql.SQLCommand;
+package com.lealone.db.session;
+
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.DataHandler;
+import com.lealone.db.RunMode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.AckPacketHandler;
+import com.lealone.server.protocol.Packet;
+import com.lealone.sql.SQLCommand;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
 
 public class DelegatedSession implements Session {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/session/Session.java b/lealone-common/src/main/java/com/lealone/db/session/Session.java
similarity index 88%
rename from lealone-common/src/main/java/org/lealone/db/session/Session.java
rename to lealone-common/src/main/java/com/lealone/db/session/Session.java
index a9eafe86d..e68aeea3b 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/Session.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/Session.java
@@ -3,27 +3,27 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
 import java.io.Closeable;
 
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.RunMode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.AckPacketHandler;
-import org.lealone.server.protocol.Packet;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
-import org.lealone.sql.SQLCommand;
-import org.lealone.storage.page.IPage;
-import org.lealone.transaction.Transaction;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.RunMode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.AckPacketHandler;
+import com.lealone.server.protocol.Packet;
+import com.lealone.sql.SQLCommand;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
+import com.lealone.storage.page.IPage;
+import com.lealone.transaction.Transaction;
 
 /**
  * A client or server session. A session represents a database connection.
diff --git a/lealone-common/src/main/java/org/lealone/db/session/SessionBase.java b/lealone-common/src/main/java/com/lealone/db/session/SessionBase.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/db/session/SessionBase.java
rename to lealone-common/src/main/java/com/lealone/db/session/SessionBase.java
index f5a6eab9e..e9ec89bd7 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/SessionBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/SessionBase.java
@@ -3,26 +3,26 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.common.trace.TraceObject;
-import org.lealone.common.trace.TraceObjectType;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.DbSetting;
-import org.lealone.db.RunMode;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.common.trace.TraceObject;
+import com.lealone.common.trace.TraceObjectType;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.DbSetting;
+import com.lealone.db.RunMode;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
+import com.lealone.storage.fs.FileUtils;
 
 public abstract class SessionBase implements Session {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/session/SessionFactory.java b/lealone-common/src/main/java/com/lealone/db/session/SessionFactory.java
similarity index 81%
rename from lealone-common/src/main/java/org/lealone/db/session/SessionFactory.java
rename to lealone-common/src/main/java/com/lealone/db/session/SessionFactory.java
index 6270375ba..fc7b2a109 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/SessionFactory.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/SessionFactory.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Plugin;
-import org.lealone.db.async.Future;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Plugin;
+import com.lealone.db.async.Future;
 
 public interface SessionFactory extends Plugin {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/session/SessionFactoryBase.java b/lealone-common/src/main/java/com/lealone/db/session/SessionFactoryBase.java
similarity index 81%
rename from lealone-common/src/main/java/org/lealone/db/session/SessionFactoryBase.java
rename to lealone-common/src/main/java/com/lealone/db/session/SessionFactoryBase.java
index 94a569744..3bf9e656e 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/SessionFactoryBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/SessionFactoryBase.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class SessionFactoryBase extends PluginBase implements SessionFactory {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/session/SessionSetting.java b/lealone-common/src/main/java/com/lealone/db/session/SessionSetting.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/session/SessionSetting.java
rename to lealone-common/src/main/java/com/lealone/db/session/SessionSetting.java
index 7187a31f0..43ec79d21 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/SessionSetting.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/SessionSetting.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
 /**
  * The list of session setting for a SET statement.
diff --git a/lealone-common/src/main/java/org/lealone/db/session/SessionStatus.java b/lealone-common/src/main/java/com/lealone/db/session/SessionStatus.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/session/SessionStatus.java
rename to lealone-common/src/main/java/com/lealone/db/session/SessionStatus.java
index ce112da80..59bc695a6 100644
--- a/lealone-common/src/main/java/org/lealone/db/session/SessionStatus.java
+++ b/lealone-common/src/main/java/com/lealone/db/session/SessionStatus.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
 public enum SessionStatus {
 
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ArrayBase.java b/lealone-common/src/main/java/com/lealone/db/value/ArrayBase.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ArrayBase.java
rename to lealone-common/src/main/java/com/lealone/db/value/ArrayBase.java
index adf4ded00..c99c6f479 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ArrayBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ArrayBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.Array;
 import java.sql.ResultSet;
@@ -11,10 +11,10 @@
 import java.sql.Types;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SimpleResultSet;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SimpleResultSet;
 
 /**
  * Represents an ARRAY value.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/BlobBase.java b/lealone-common/src/main/java/com/lealone/db/value/BlobBase.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/BlobBase.java
rename to lealone-common/src/main/java/com/lealone/db/value/BlobBase.java
index 780c436e0..0f1e560e2 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/BlobBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/BlobBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -12,11 +12,11 @@
 import java.sql.Blob;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObject;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObject;
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * Represents a BLOB value.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ClobBase.java b/lealone-common/src/main/java/com/lealone/db/value/ClobBase.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ClobBase.java
rename to lealone-common/src/main/java/com/lealone/db/value/ClobBase.java
index 363c1d012..d15e01db4 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ClobBase.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ClobBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -14,11 +14,11 @@
 import java.sql.NClob;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceObject;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceObject;
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * Represents a CLOB value.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/CompareMode.java b/lealone-common/src/main/java/com/lealone/db/value/CompareMode.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/db/value/CompareMode.java
rename to lealone-common/src/main/java/com/lealone/db/value/CompareMode.java
index e0c91bd1c..ffd14dbdc 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/CompareMode.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/CompareMode.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.text.Collator;
 import java.util.Locale;
 
-import org.lealone.common.util.StringUtils;
+import com.lealone.common.util.StringUtils;
 
 /**
  * Instances of this class can compare strings. Case sensitive and case
diff --git a/lealone-common/src/main/java/org/lealone/db/value/CompareModeDefault.java b/lealone-common/src/main/java/com/lealone/db/value/CompareModeDefault.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/value/CompareModeDefault.java
rename to lealone-common/src/main/java/com/lealone/db/value/CompareModeDefault.java
index b896f8727..35a0bf986 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/CompareModeDefault.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/CompareModeDefault.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.text.CollationKey;
 import java.text.Collator;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.SmallLRUCache;
-import org.lealone.db.SysProperties;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.SmallLRUCache;
+import com.lealone.db.SysProperties;
 
 /**
  * The default implementation of CompareMode. It uses java.text.Collator.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/CompareModeIcu4J.java b/lealone-common/src/main/java/com/lealone/db/value/CompareModeIcu4J.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/value/CompareModeIcu4J.java
rename to lealone-common/src/main/java/com/lealone/db/value/CompareModeIcu4J.java
index b23752d29..218412d35 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/CompareModeIcu4J.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/CompareModeIcu4J.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.lang.reflect.Method;
 import java.util.Comparator;
 import java.util.Locale;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
 
 /**
  * An implementation of CompareMode that uses the ICU4J Collator.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/DataType.java b/lealone-common/src/main/java/com/lealone/db/value/DataType.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/db/value/DataType.java
rename to lealone-common/src/main/java/com/lealone/db/value/DataType.java
index 785cf0d0e..48fa928cd 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/DataType.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/DataType.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -23,16 +23,16 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.LocalDataHandler;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SimpleResultSet;
-import org.lealone.db.session.Session;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.LocalDataHandler;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SimpleResultSet;
+import com.lealone.db.session.Session;
 
 /**
  * This class contains meta data information about data types,
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ReadonlyArray.java b/lealone-common/src/main/java/com/lealone/db/value/ReadonlyArray.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/value/ReadonlyArray.java
rename to lealone-common/src/main/java/com/lealone/db/value/ReadonlyArray.java
index 0feb9d3e6..2b48652f3 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ReadonlyArray.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ReadonlyArray.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.util.List;
 
-import org.lealone.common.trace.Trace;
-import org.lealone.common.util.StatementBuilder;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.util.StatementBuilder;
 
 /**
  * Represents a readonly ARRAY value.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ReadonlyBlob.java b/lealone-common/src/main/java/com/lealone/db/value/ReadonlyBlob.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/db/value/ReadonlyBlob.java
rename to lealone-common/src/main/java/com/lealone/db/value/ReadonlyBlob.java
index 71ca872de..b2fbf59a3 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ReadonlyBlob.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ReadonlyBlob.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.sql.SQLException;
 
-import org.lealone.common.trace.Trace;
-import org.lealone.db.LocalDataHandler;
+import com.lealone.common.trace.Trace;
+import com.lealone.db.LocalDataHandler;
 
 /**
  * Represents a readonly BLOB value.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ReadonlyClob.java b/lealone-common/src/main/java/com/lealone/db/value/ReadonlyClob.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/db/value/ReadonlyClob.java
rename to lealone-common/src/main/java/com/lealone/db/value/ReadonlyClob.java
index b6d9065db..b024c7a90 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ReadonlyClob.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ReadonlyClob.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
 import java.sql.SQLException;
 
-import org.lealone.common.trace.Trace;
-import org.lealone.db.LocalDataHandler;
+import com.lealone.common.trace.Trace;
+import com.lealone.db.LocalDataHandler;
 
 /**
  * Represents a readonly CLOB value.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/Value.java b/lealone-common/src/main/java/com/lealone/db/value/Value.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/db/value/Value.java
rename to lealone-common/src/main/java/com/lealone/db/value/Value.java
index 042d80663..9b3250823 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/Value.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/Value.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -24,15 +24,15 @@
 import java.sql.Types;
 import java.util.UUID;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SimpleResultSet;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SimpleResultSet;
 
 /**
  * This is the base class for all value classes.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueArray.java b/lealone-common/src/main/java/com/lealone/db/value/ValueArray.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueArray.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueArray.java
index 04dbb1c8c..36a68d063 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueArray.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueArray.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.lang.reflect.Array;
 import java.sql.PreparedStatement;
@@ -12,10 +12,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
 
 /**
  * Implementation of the ARRAY data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueBoolean.java b/lealone-common/src/main/java/com/lealone/db/value/ValueBoolean.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueBoolean.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueBoolean.java
index 9e6b2a97b..62063a758 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueBoolean.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueBoolean.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.db.DataBuffer;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the BOOLEAN data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueByte.java b/lealone-common/src/main/java/com/lealone/db/value/ValueByte.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueByte.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueByte.java
index 9389d2c12..e39933ceb 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueByte.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueByte.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the BYTE data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueBytes.java b/lealone-common/src/main/java/com/lealone/db/value/ValueBytes.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueBytes.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueBytes.java
index a1e9d7a67..0b69b5958 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueBytes.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueBytes.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Arrays;
 
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.SysProperties;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.SysProperties;
 
 /**
  * Implementation of the BINARY data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueDate.java b/lealone-common/src/main/java/com/lealone/db/value/ValueDate.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueDate.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueDate.java
index 555265a68..d4274c41c 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueDate.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueDate.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the DATE data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueDecimal.java b/lealone-common/src/main/java/com/lealone/db/value/ValueDecimal.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueDecimal.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueDecimal.java
index 719edeed6..2e9e63e56 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueDecimal.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueDecimal.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -12,12 +12,12 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the DECIMAL data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueDouble.java b/lealone-common/src/main/java/com/lealone/db/value/ValueDouble.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueDouble.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueDouble.java
index 555740efd..fee695bf6 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueDouble.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueDouble.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the DOUBLE data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueEnum.java b/lealone-common/src/main/java/com/lealone/db/value/ValueEnum.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueEnum.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueEnum.java
index ad8d669c7..6f56ebfb6 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueEnum.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueEnum.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * Implementation of the ENUM data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueFloat.java b/lealone-common/src/main/java/com/lealone/db/value/ValueFloat.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueFloat.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueFloat.java
index 324b73f74..221203470 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueFloat.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueFloat.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the REAL data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueInt.java b/lealone-common/src/main/java/com/lealone/db/value/ValueInt.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueInt.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueInt.java
index 6ecf6be06..a2c10aa95 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueInt.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueInt.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the INT data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueJavaObject.java b/lealone-common/src/main/java/com/lealone/db/value/ValueJavaObject.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueJavaObject.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueJavaObject.java
index 8d0c3addd..ffd287f44 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueJavaObject.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueJavaObject.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import org.lealone.common.util.Utils;
-import org.lealone.db.SysProperties;
+import com.lealone.common.util.Utils;
+import com.lealone.db.SysProperties;
 
 /**
  * Implementation of the OBJECT data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueList.java b/lealone-common/src/main/java/com/lealone/db/value/ValueList.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueList.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueList.java
index 743885d63..df36bb7fa 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueList.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueList.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.lang.reflect.Array;
 import java.sql.PreparedStatement;
@@ -11,9 +11,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
 
 /**
  * Implementation of the LIST data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueLob.java b/lealone-common/src/main/java/com/lealone/db/value/ValueLob.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueLob.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueLob.java
index 0986dbea6..b7a04ce58 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueLob.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueLob.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -15,20 +15,20 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.SysProperties;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.fs.FileStorageInputStream;
-import org.lealone.storage.fs.FileStorageOutputStream;
-import org.lealone.storage.fs.FileUtils;
-import org.lealone.storage.lob.LobStorage;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.SysProperties;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.fs.FileStorageInputStream;
+import com.lealone.storage.fs.FileStorageOutputStream;
+import com.lealone.storage.fs.FileUtils;
+import com.lealone.storage.lob.LobStorage;
 
 /**
  * A implementation of the BLOB and CLOB data types.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueLong.java b/lealone-common/src/main/java/com/lealone/db/value/ValueLong.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueLong.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueLong.java
index 0f533b061..80e1dfe1c 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueLong.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueLong.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -11,12 +11,12 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the BIGINT data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueMap.java b/lealone-common/src/main/java/com/lealone/db/value/ValueMap.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueMap.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueMap.java
index 846e8ebfb..2180b690b 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueMap.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueMap.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.PreparedStatement;
 import java.util.HashMap;
@@ -11,9 +11,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
 
 /**
  * Implementation of the MAP data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueNull.java b/lealone-common/src/main/java/com/lealone/db/value/ValueNull.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueNull.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueNull.java
index 48b6a5eee..64e4ce5b7 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueNull.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueNull.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -15,9 +15,9 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DataBuffer;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DataBuffer;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of NULL. NULL is not a regular data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueResultSet.java b/lealone-common/src/main/java/com/lealone/db/value/ValueResultSet.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueResultSet.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueResultSet.java
index e0d5ce9c9..4d5b629dc 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueResultSet.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueResultSet.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.result.SimpleResultSet;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.result.SimpleResultSet;
 
 /**
  * Implementation of the RESULT_SET data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueSet.java b/lealone-common/src/main/java/com/lealone/db/value/ValueSet.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueSet.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueSet.java
index 1f4e90c87..66f81d719 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueSet.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueSet.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.sql.PreparedStatement;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
 
 /**
  * Implementation of the SET data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueShort.java b/lealone-common/src/main/java/com/lealone/db/value/ValueShort.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueShort.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueShort.java
index 0dbe6e278..053f4c2ca 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueShort.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueShort.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the SMALLINT data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueString.java b/lealone-common/src/main/java/com/lealone/db/value/ValueString.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueString.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueString.java
index 1bdb729d5..1024e8c12 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueString.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueString.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.SysProperties;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.SysProperties;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the VARCHAR data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueStringFixed.java b/lealone-common/src/main/java/com/lealone/db/value/ValueStringFixed.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueStringFixed.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueStringFixed.java
index d76351b06..6499fe16a 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueStringFixed.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueStringFixed.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.SysProperties;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.SysProperties;
 
 /**
  * Implementation of the CHAR data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueStringIgnoreCase.java b/lealone-common/src/main/java/com/lealone/db/value/ValueStringIgnoreCase.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueStringIgnoreCase.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueStringIgnoreCase.java
index 6250fb3d5..aff9e6e0e 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueStringIgnoreCase.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueStringIgnoreCase.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.SysProperties;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.SysProperties;
 
 /**
  * Implementation of the VARCHAR_IGNORECASE data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueTime.java b/lealone-common/src/main/java/com/lealone/db/value/ValueTime.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueTime.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueTime.java
index 87f535dad..bb90fe1c0 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueTime.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueTime.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Time;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the TIME data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueTimestamp.java b/lealone-common/src/main/java/com/lealone/db/value/ValueTimestamp.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueTimestamp.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueTimestamp.java
index f42126073..9757af1c1 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueTimestamp.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueTimestamp.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -14,13 +14,13 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the TIMESTAMP data type.
diff --git a/lealone-common/src/main/java/org/lealone/db/value/ValueUuid.java b/lealone-common/src/main/java/com/lealone/db/value/ValueUuid.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/db/value/ValueUuid.java
rename to lealone-common/src/main/java/com/lealone/db/value/ValueUuid.java
index e9a9bf2d4..aed02cca9 100644
--- a/lealone-common/src/main/java/org/lealone/db/value/ValueUuid.java
+++ b/lealone-common/src/main/java/com/lealone/db/value/ValueUuid.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package com.lealone.db.value;
 
 import java.nio.ByteBuffer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.UUID;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.type.StorageDataTypeBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.type.StorageDataTypeBase;
 
 /**
  * Implementation of the UUID data type.
diff --git a/lealone-common/src/main/java/org/lealone/net/NetInputStream.java b/lealone-common/src/main/java/com/lealone/net/NetInputStream.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/net/NetInputStream.java
rename to lealone-common/src/main/java/com/lealone/net/NetInputStream.java
index 15df150db..a54cefcd1 100644
--- a/lealone-common/src/main/java/org/lealone/net/NetInputStream.java
+++ b/lealone-common/src/main/java/com/lealone/net/NetInputStream.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 public interface NetInputStream {
 
diff --git a/lealone-common/src/main/java/org/lealone/net/NetNode.java b/lealone-common/src/main/java/com/lealone/net/NetNode.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/net/NetNode.java
rename to lealone-common/src/main/java/com/lealone/net/NetNode.java
index 4133d7d33..a6718aa39 100644
--- a/lealone-common/src/main/java/org/lealone/net/NetNode.java
+++ b/lealone-common/src/main/java/com/lealone/net/NetNode.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -12,7 +12,7 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
-import org.lealone.db.Constants;
+import com.lealone.db.Constants;
 
 public class NetNode implements Comparable {
 
diff --git a/lealone-common/src/main/java/org/lealone/net/NetOutputStream.java b/lealone-common/src/main/java/com/lealone/net/NetOutputStream.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/net/NetOutputStream.java
rename to lealone-common/src/main/java/com/lealone/net/NetOutputStream.java
index 458081bbc..1d60edda1 100644
--- a/lealone-common/src/main/java/org/lealone/net/NetOutputStream.java
+++ b/lealone-common/src/main/java/com/lealone/net/NetOutputStream.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 public interface NetOutputStream {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/DelegatedProtocolServer.java b/lealone-common/src/main/java/com/lealone/server/DelegatedProtocolServer.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/server/DelegatedProtocolServer.java
rename to lealone-common/src/main/java/com/lealone/server/DelegatedProtocolServer.java
index bbe770a98..45eaeb40d 100644
--- a/lealone-common/src/main/java/org/lealone/server/DelegatedProtocolServer.java
+++ b/lealone-common/src/main/java/com/lealone/server/DelegatedProtocolServer.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.util.Map;
 
-import org.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
+import com.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
 
 public class DelegatedProtocolServer implements ProtocolServer {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/ProtocolServer.java b/lealone-common/src/main/java/com/lealone/server/ProtocolServer.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/server/ProtocolServer.java
rename to lealone-common/src/main/java/com/lealone/server/ProtocolServer.java
index 5e298c007..503e8664e 100644
--- a/lealone-common/src/main/java/org/lealone/server/ProtocolServer.java
+++ b/lealone-common/src/main/java/com/lealone/server/ProtocolServer.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.util.Map;
 
-import org.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
+import com.lealone.db.scheduler.Scheduler;
 
 /**
  * Classes implementing this interface usually provide a TCP/IP listener such as an TCP server.
diff --git a/lealone-common/src/main/java/org/lealone/server/ProtocolServerBase.java b/lealone-common/src/main/java/com/lealone/server/ProtocolServerBase.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/server/ProtocolServerBase.java
rename to lealone-common/src/main/java/com/lealone/server/ProtocolServerBase.java
index 4c8cec2ae..dec879255 100644
--- a/lealone-common/src/main/java/org/lealone/server/ProtocolServerBase.java
+++ b/lealone-common/src/main/java/com/lealone/server/ProtocolServerBase.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
-import org.lealone.common.util.MapUtils;
-import org.lealone.db.Constants;
+import com.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
+import com.lealone.common.util.MapUtils;
+import com.lealone.db.Constants;
 
 public abstract class ProtocolServerBase implements ProtocolServer {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/ProtocolServerEngine.java b/lealone-common/src/main/java/com/lealone/server/ProtocolServerEngine.java
similarity index 85%
rename from lealone-common/src/main/java/org/lealone/server/ProtocolServerEngine.java
rename to lealone-common/src/main/java/com/lealone/server/ProtocolServerEngine.java
index dacc1ed69..f83666b18 100644
--- a/lealone-common/src/main/java/org/lealone/server/ProtocolServerEngine.java
+++ b/lealone-common/src/main/java/com/lealone/server/ProtocolServerEngine.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.lealone.db.PluggableEngine;
+import com.lealone.db.PluggableEngine;
 
 public interface ProtocolServerEngine extends PluggableEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/ProtocolServerEngineBase.java b/lealone-common/src/main/java/com/lealone/server/ProtocolServerEngineBase.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/server/ProtocolServerEngineBase.java
rename to lealone-common/src/main/java/com/lealone/server/ProtocolServerEngineBase.java
index 86d6182d4..6b42b847d 100644
--- a/lealone-common/src/main/java/org/lealone/server/ProtocolServerEngineBase.java
+++ b/lealone-common/src/main/java/com/lealone/server/ProtocolServerEngineBase.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.util.Map;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class ProtocolServerEngineBase extends PluginBase implements ProtocolServerEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/AckPacket.java b/lealone-common/src/main/java/com/lealone/server/protocol/AckPacket.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/server/protocol/AckPacket.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/AckPacket.java
index 6e1018f67..2fff91f9d 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/AckPacket.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/AckPacket.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 public interface AckPacket extends Packet {
     @Override
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/AckPacketHandler.java b/lealone-common/src/main/java/com/lealone/server/protocol/AckPacketHandler.java
similarity index 84%
rename from lealone-common/src/main/java/org/lealone/server/protocol/AckPacketHandler.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/AckPacketHandler.java
index 620318a7f..e5bfaa28d 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/AckPacketHandler.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/AckPacketHandler.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 public interface AckPacketHandler {
     R handle(P ack);
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/NoAckPacket.java b/lealone-common/src/main/java/com/lealone/server/protocol/NoAckPacket.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/server/protocol/NoAckPacket.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/NoAckPacket.java
index d6bc25e89..d0f0f0618 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/NoAckPacket.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/NoAckPacket.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 public interface NoAckPacket extends Packet {
     @Override
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/Packet.java b/lealone-common/src/main/java/com/lealone/server/protocol/Packet.java
similarity index 80%
rename from lealone-common/src/main/java/org/lealone/server/protocol/Packet.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/Packet.java
index 0052ef99a..9a17013a2 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/Packet.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/Packet.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 import java.io.IOException;
 
-import org.lealone.net.NetOutputStream;
+import com.lealone.net.NetOutputStream;
 
 public interface Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/PacketDecoder.java b/lealone-common/src/main/java/com/lealone/server/protocol/PacketDecoder.java
similarity index 78%
rename from lealone-common/src/main/java/org/lealone/server/protocol/PacketDecoder.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/PacketDecoder.java
index 1349ae1d4..d7e04fe28 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/PacketDecoder.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/PacketDecoder.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
+import com.lealone.net.NetInputStream;
 
 public interface PacketDecoder {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/PacketDecoders.java b/lealone-common/src/main/java/com/lealone/server/protocol/PacketDecoders.java
similarity index 65%
rename from lealone-common/src/main/java/org/lealone/server/protocol/PacketDecoders.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/PacketDecoders.java
index 51afeef19..efbc4ae52 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/PacketDecoders.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/PacketDecoders.java
@@ -3,36 +3,36 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
-import org.lealone.server.protocol.batch.BatchStatementPreparedUpdate;
-import org.lealone.server.protocol.batch.BatchStatementUpdate;
-import org.lealone.server.protocol.batch.BatchStatementUpdateAck;
-import org.lealone.server.protocol.lob.LobRead;
-import org.lealone.server.protocol.lob.LobReadAck;
-import org.lealone.server.protocol.ps.PreparedStatementClose;
-import org.lealone.server.protocol.ps.PreparedStatementGetMetaData;
-import org.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck;
-import org.lealone.server.protocol.ps.PreparedStatementPrepare;
-import org.lealone.server.protocol.ps.PreparedStatementPrepareAck;
-import org.lealone.server.protocol.ps.PreparedStatementPrepareReadParams;
-import org.lealone.server.protocol.ps.PreparedStatementPrepareReadParamsAck;
-import org.lealone.server.protocol.ps.PreparedStatementQuery;
-import org.lealone.server.protocol.ps.PreparedStatementUpdate;
-import org.lealone.server.protocol.result.ResultChangeId;
-import org.lealone.server.protocol.result.ResultClose;
-import org.lealone.server.protocol.result.ResultFetchRows;
-import org.lealone.server.protocol.result.ResultFetchRowsAck;
-import org.lealone.server.protocol.result.ResultReset;
-import org.lealone.server.protocol.session.SessionCancelStatement;
-import org.lealone.server.protocol.session.SessionClose;
-import org.lealone.server.protocol.session.SessionInit;
-import org.lealone.server.protocol.session.SessionInitAck;
-import org.lealone.server.protocol.session.SessionSetAutoCommit;
-import org.lealone.server.protocol.statement.StatementQuery;
-import org.lealone.server.protocol.statement.StatementQueryAck;
-import org.lealone.server.protocol.statement.StatementUpdate;
-import org.lealone.server.protocol.statement.StatementUpdateAck;
+import com.lealone.server.protocol.batch.BatchStatementPreparedUpdate;
+import com.lealone.server.protocol.batch.BatchStatementUpdate;
+import com.lealone.server.protocol.batch.BatchStatementUpdateAck;
+import com.lealone.server.protocol.lob.LobRead;
+import com.lealone.server.protocol.lob.LobReadAck;
+import com.lealone.server.protocol.ps.PreparedStatementClose;
+import com.lealone.server.protocol.ps.PreparedStatementGetMetaData;
+import com.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck;
+import com.lealone.server.protocol.ps.PreparedStatementPrepare;
+import com.lealone.server.protocol.ps.PreparedStatementPrepareAck;
+import com.lealone.server.protocol.ps.PreparedStatementPrepareReadParams;
+import com.lealone.server.protocol.ps.PreparedStatementPrepareReadParamsAck;
+import com.lealone.server.protocol.ps.PreparedStatementQuery;
+import com.lealone.server.protocol.ps.PreparedStatementUpdate;
+import com.lealone.server.protocol.result.ResultChangeId;
+import com.lealone.server.protocol.result.ResultClose;
+import com.lealone.server.protocol.result.ResultFetchRows;
+import com.lealone.server.protocol.result.ResultFetchRowsAck;
+import com.lealone.server.protocol.result.ResultReset;
+import com.lealone.server.protocol.session.SessionCancelStatement;
+import com.lealone.server.protocol.session.SessionClose;
+import com.lealone.server.protocol.session.SessionInit;
+import com.lealone.server.protocol.session.SessionInitAck;
+import com.lealone.server.protocol.session.SessionSetAutoCommit;
+import com.lealone.server.protocol.statement.StatementQuery;
+import com.lealone.server.protocol.statement.StatementQueryAck;
+import com.lealone.server.protocol.statement.StatementUpdate;
+import com.lealone.server.protocol.statement.StatementUpdateAck;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class PacketDecoders {
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/PacketType.java b/lealone-common/src/main/java/com/lealone/server/protocol/PacketType.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/server/protocol/PacketType.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/PacketType.java
index 9cc099fce..9708fcf91 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/PacketType.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/PacketType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 // 协议包的类型值没有使用枚举常量的ordinal值而是自定义的值，这样允许改变枚举常量的定义顺序，
 // 类型值会编码到协议包中，所以不能随便改动，不同协议包的类型值之间有意设置了间隔，用于后续加新的协议包
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/QueryPacket.java b/lealone-common/src/main/java/com/lealone/server/protocol/QueryPacket.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/server/protocol/QueryPacket.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/QueryPacket.java
index 4ee294c08..b61b44318 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/QueryPacket.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/QueryPacket.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol;
+package com.lealone.server.protocol;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
 
 public abstract class QueryPacket implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java b/lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java
index 6ab28f041..e7f538dc0 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementPreparedUpdate.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.batch;
+package com.lealone.server.protocol.batch;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lealone.db.value.Value;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.db.value.Value;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class BatchStatementPreparedUpdate implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementUpdate.java b/lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementUpdate.java
similarity index 84%
rename from lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementUpdate.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementUpdate.java
index 08055b939..5b4e5ae13 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementUpdate.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementUpdate.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.batch;
+package com.lealone.server.protocol.batch;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class BatchStatementUpdate implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementUpdateAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementUpdateAck.java
similarity index 83%
rename from lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementUpdateAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementUpdateAck.java
index 1cd57fbbf..759703bc9 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/batch/BatchStatementUpdateAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/batch/BatchStatementUpdateAck.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.batch;
+package com.lealone.server.protocol.batch;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class BatchStatementUpdateAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/lob/LobRead.java b/lealone-common/src/main/java/com/lealone/server/protocol/lob/LobRead.java
similarity index 82%
rename from lealone-common/src/main/java/org/lealone/server/protocol/lob/LobRead.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/lob/LobRead.java
index 67c5c6cb9..bea7f7eef 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/lob/LobRead.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/lob/LobRead.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.lob;
+package com.lealone.server.protocol.lob;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class LobRead implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/lob/LobReadAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/lob/LobReadAck.java
similarity index 75%
rename from lealone-common/src/main/java/org/lealone/server/protocol/lob/LobReadAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/lob/LobReadAck.java
index 070e207f1..50abe920a 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/lob/LobReadAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/lob/LobReadAck.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.lob;
+package com.lealone.server.protocol.lob;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class LobReadAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementClose.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementClose.java
similarity index 77%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementClose.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementClose.java
index 6f5df9092..af896b34e 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementClose.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementClose.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementClose implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementGetMetaData.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementGetMetaData.java
similarity index 80%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementGetMetaData.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementGetMetaData.java
index a2b2ebcf6..d7472e191 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementGetMetaData.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementGetMetaData.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementGetMetaData implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java
index bbc253c6e..9eb952ff4 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementGetMetaDataAck.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.db.result.Result;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.db.result.Result;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementGetMetaDataAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepare.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepare.java
similarity index 82%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepare.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepare.java
index da981751c..84972edc3 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepare.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepare.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementPrepare implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareAck.java
similarity index 78%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareAck.java
index d5589963a..79105255c 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareAck.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementPrepareAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java
similarity index 83%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java
index 60286a3cd..4e9be6954 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareReadParams.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementPrepareReadParams implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java
index 8c18ad0db..0b7d833f8 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementPrepareReadParamsAck.java
@@ -3,22 +3,22 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 import java.sql.ResultSetMetaData;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.value.Value;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.value.Value;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementPrepareReadParamsAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementQuery.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementQuery.java
similarity index 85%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementQuery.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementQuery.java
index d176b75d8..c608ddc87 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementQuery.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementQuery.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.db.value.Value;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.QueryPacket;
+import com.lealone.db.value.Value;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.QueryPacket;
 
 public class PreparedStatementQuery extends QueryPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementUpdate.java b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementUpdate.java
similarity index 84%
rename from lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementUpdate.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementUpdate.java
index 266e23f82..2f36e099c 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/ps/PreparedStatementUpdate.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/ps/PreparedStatementUpdate.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.ps;
+package com.lealone.server.protocol.ps;
 
 import java.io.IOException;
 
-import org.lealone.db.value.Value;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.db.value.Value;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class PreparedStatementUpdate implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultChangeId.java b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultChangeId.java
similarity index 77%
rename from lealone-common/src/main/java/org/lealone/server/protocol/result/ResultChangeId.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/result/ResultChangeId.java
index 3f1859e36..8dcc1d158 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultChangeId.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultChangeId.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.result;
+package com.lealone.server.protocol.result;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class ResultChangeId implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultClose.java b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultClose.java
similarity index 76%
rename from lealone-common/src/main/java/org/lealone/server/protocol/result/ResultClose.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/result/ResultClose.java
index bc311e900..bacf60843 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultClose.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultClose.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.result;
+package com.lealone.server.protocol.result;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class ResultClose implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultFetchRows.java b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultFetchRows.java
similarity index 80%
rename from lealone-common/src/main/java/org/lealone/server/protocol/result/ResultFetchRows.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/result/ResultFetchRows.java
index 7dc65d786..16e9c4b54 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultFetchRows.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultFetchRows.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.result;
+package com.lealone.server.protocol.result;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class ResultFetchRows implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultFetchRowsAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultFetchRowsAck.java
similarity index 84%
rename from lealone-common/src/main/java/org/lealone/server/protocol/result/ResultFetchRowsAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/result/ResultFetchRowsAck.java
index 607637de2..6b792d9ca 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultFetchRowsAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultFetchRowsAck.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.result;
+package com.lealone.server.protocol.result;
 
 import java.io.IOException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.Value;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.Value;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class ResultFetchRowsAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultReset.java b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultReset.java
similarity index 76%
rename from lealone-common/src/main/java/org/lealone/server/protocol/result/ResultReset.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/result/ResultReset.java
index d0120887e..061fa5e3d 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/result/ResultReset.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/result/ResultReset.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.result;
+package com.lealone.server.protocol.result;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class ResultReset implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionCancelStatement.java b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionCancelStatement.java
similarity index 77%
rename from lealone-common/src/main/java/org/lealone/server/protocol/session/SessionCancelStatement.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/session/SessionCancelStatement.java
index 4dcec3ce0..67031ef78 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionCancelStatement.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionCancelStatement.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.session;
+package com.lealone.server.protocol.session;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class SessionCancelStatement implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionClose.java b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionClose.java
similarity index 73%
rename from lealone-common/src/main/java/org/lealone/server/protocol/session/SessionClose.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/session/SessionClose.java
index 8d59bf1e5..6738cceee 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionClose.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionClose.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.session;
+package com.lealone.server.protocol.session;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class SessionClose implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionInit.java b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionInit.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/server/protocol/session/SessionInit.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/session/SessionInit.java
index 04f82002c..7ddf8be7b 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionInit.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionInit.java
@@ -3,19 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.session;
+package com.lealone.server.protocol.session;
 
 import java.io.IOException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class SessionInit implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionInitAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionInitAck.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/server/protocol/session/SessionInitAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/session/SessionInitAck.java
index f8213453e..d49574c1b 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionInitAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionInitAck.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.session;
+package com.lealone.server.protocol.session;
 
 import java.io.IOException;
 
-import org.lealone.db.Constants;
-import org.lealone.db.RunMode;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.db.Constants;
+import com.lealone.db.RunMode;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class SessionInitAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionSetAutoCommit.java b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionSetAutoCommit.java
similarity index 77%
rename from lealone-common/src/main/java/org/lealone/server/protocol/session/SessionSetAutoCommit.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/session/SessionSetAutoCommit.java
index 7a0cb2bf5..0ab3d0b6b 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/session/SessionSetAutoCommit.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/session/SessionSetAutoCommit.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.session;
+package com.lealone.server.protocol.session;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.NoAckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.NoAckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class SessionSetAutoCommit implements NoAckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementQuery.java b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementQuery.java
similarity index 83%
rename from lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementQuery.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementQuery.java
index 61ac936f8..1bdfcdbcc 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementQuery.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementQuery.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.statement;
+package com.lealone.server.protocol.statement;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.QueryPacket;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.QueryPacket;
 
 public class StatementQuery extends QueryPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementQueryAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementQueryAck.java
similarity index 82%
rename from lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementQueryAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementQueryAck.java
index ba71be743..a0d5da161 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementQueryAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementQueryAck.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.statement;
+package com.lealone.server.protocol.statement;
 
 import java.io.IOException;
 
-import org.lealone.db.result.Result;
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck;
-import org.lealone.server.protocol.result.ResultFetchRowsAck;
+import com.lealone.db.result.Result;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck;
+import com.lealone.server.protocol.result.ResultFetchRowsAck;
 
 public class StatementQueryAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementUpdate.java b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementUpdate.java
similarity index 81%
rename from lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementUpdate.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementUpdate.java
index 745830514..902e12b95 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementUpdate.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementUpdate.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.statement;
+package com.lealone.server.protocol.statement;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class StatementUpdate implements Packet {
 
diff --git a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementUpdateAck.java b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementUpdateAck.java
similarity index 79%
rename from lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementUpdateAck.java
rename to lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementUpdateAck.java
index 27c4c9672..009837da3 100644
--- a/lealone-common/src/main/java/org/lealone/server/protocol/statement/StatementUpdateAck.java
+++ b/lealone-common/src/main/java/com/lealone/server/protocol/statement/StatementUpdateAck.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.protocol.statement;
+package com.lealone.server.protocol.statement;
 
 import java.io.IOException;
 
-import org.lealone.net.NetInputStream;
-import org.lealone.net.NetOutputStream;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.net.NetInputStream;
+import com.lealone.net.NetOutputStream;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketType;
 
 public class StatementUpdateAck implements AckPacket {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/IExpression.java b/lealone-common/src/main/java/com/lealone/sql/IExpression.java
similarity index 89%
rename from lealone-common/src/main/java/org/lealone/sql/IExpression.java
rename to lealone-common/src/main/java/com/lealone/sql/IExpression.java
index 3d8f6fa17..f9cb402ba 100644
--- a/lealone-common/src/main/java/org/lealone/sql/IExpression.java
+++ b/lealone-common/src/main/java/com/lealone/sql/IExpression.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 import java.util.Set;
 
-import org.lealone.db.session.Session;
-import org.lealone.db.value.Value;
+import com.lealone.db.session.Session;
+import com.lealone.db.value.Value;
 
 public interface IExpression {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/IQuery.java b/lealone-common/src/main/java/com/lealone/sql/IQuery.java
similarity index 86%
rename from lealone-common/src/main/java/org/lealone/sql/IQuery.java
rename to lealone-common/src/main/java/com/lealone/sql/IQuery.java
index fdd2b8a8e..05b77a28a 100644
--- a/lealone-common/src/main/java/org/lealone/sql/IQuery.java
+++ b/lealone-common/src/main/java/com/lealone/sql/IQuery.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 import java.util.List;
 import java.util.Set;
 
-import org.lealone.db.CommandParameter;
-import org.lealone.db.result.Result;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.result.Result;
 
 public interface IQuery {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/ISelectUnion.java b/lealone-common/src/main/java/com/lealone/sql/ISelectUnion.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/sql/ISelectUnion.java
rename to lealone-common/src/main/java/com/lealone/sql/ISelectUnion.java
index 9d36b2e86..3d4d34f06 100644
--- a/lealone-common/src/main/java/org/lealone/sql/ISelectUnion.java
+++ b/lealone-common/src/main/java/com/lealone/sql/ISelectUnion.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
-import org.lealone.db.result.Result;
+import com.lealone.db.result.Result;
 
 public interface ISelectUnion {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/ParsedSQLStatement.java b/lealone-common/src/main/java/com/lealone/sql/ParsedSQLStatement.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/sql/ParsedSQLStatement.java
rename to lealone-common/src/main/java/com/lealone/sql/ParsedSQLStatement.java
index 19c1b8cab..5e71bbdde 100644
--- a/lealone-common/src/main/java/org/lealone/sql/ParsedSQLStatement.java
+++ b/lealone-common/src/main/java/com/lealone/sql/ParsedSQLStatement.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 public interface ParsedSQLStatement extends SQLStatement {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/PreparedSQLStatement.java b/lealone-common/src/main/java/com/lealone/sql/PreparedSQLStatement.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/sql/PreparedSQLStatement.java
rename to lealone-common/src/main/java/com/lealone/sql/PreparedSQLStatement.java
index 92d0da8b8..515c48d8d 100644
--- a/lealone-common/src/main/java/org/lealone/sql/PreparedSQLStatement.java
+++ b/lealone-common/src/main/java/com/lealone/sql/PreparedSQLStatement.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
-import org.lealone.db.ManualCloseable;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.Session;
+import com.lealone.db.ManualCloseable;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.Session;
 
 public interface PreparedSQLStatement extends SQLStatement, ManualCloseable {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/SQLCommand.java b/lealone-common/src/main/java/com/lealone/sql/SQLCommand.java
similarity index 88%
rename from lealone-common/src/main/java/org/lealone/sql/SQLCommand.java
rename to lealone-common/src/main/java/com/lealone/sql/SQLCommand.java
index 764c71ac3..cb3b866bc 100644
--- a/lealone-common/src/main/java/org/lealone/sql/SQLCommand.java
+++ b/lealone-common/src/main/java/com/lealone/sql/SQLCommand.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 import java.util.List;
 
-import org.lealone.db.Command;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Result;
+import com.lealone.db.Command;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Result;
 
 public interface SQLCommand extends Command {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/SQLEngine.java b/lealone-common/src/main/java/com/lealone/sql/SQLEngine.java
similarity index 73%
rename from lealone-common/src/main/java/org/lealone/sql/SQLEngine.java
rename to lealone-common/src/main/java/com/lealone/sql/SQLEngine.java
index b4e2085b6..274efcaa8 100644
--- a/lealone-common/src/main/java/org/lealone/sql/SQLEngine.java
+++ b/lealone-common/src/main/java/com/lealone/sql/SQLEngine.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
-
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Constants;
-import org.lealone.db.PluggableEngine;
-import org.lealone.db.PluginManager;
-import org.lealone.db.session.Session;
-import org.lealone.db.value.Value;
+package com.lealone.sql;
+
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Constants;
+import com.lealone.db.PluggableEngine;
+import com.lealone.db.PluginManager;
+import com.lealone.db.session.Session;
+import com.lealone.db.value.Value;
 
 public interface SQLEngine extends PluggableEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/SQLParser.java b/lealone-common/src/main/java/com/lealone/sql/SQLParser.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/sql/SQLParser.java
rename to lealone-common/src/main/java/com/lealone/sql/SQLParser.java
index b288a1643..aee4d70a8 100644
--- a/lealone-common/src/main/java/org/lealone/sql/SQLParser.java
+++ b/lealone-common/src/main/java/com/lealone/sql/SQLParser.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 public interface SQLParser {
 
diff --git a/lealone-common/src/main/java/org/lealone/sql/SQLStatement.java b/lealone-common/src/main/java/com/lealone/sql/SQLStatement.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/sql/SQLStatement.java
rename to lealone-common/src/main/java/com/lealone/sql/SQLStatement.java
index 8802200cf..dd09dd964 100644
--- a/lealone-common/src/main/java/org/lealone/sql/SQLStatement.java
+++ b/lealone-common/src/main/java/com/lealone/sql/SQLStatement.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 /**
  * Represents a SQL statement.
diff --git a/lealone-common/src/main/java/org/lealone/storage/CursorParameters.java b/lealone-common/src/main/java/com/lealone/storage/CursorParameters.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/storage/CursorParameters.java
rename to lealone-common/src/main/java/com/lealone/storage/CursorParameters.java
index 5a497d23a..27097bedb 100644
--- a/lealone-common/src/main/java/org/lealone/storage/CursorParameters.java
+++ b/lealone-common/src/main/java/com/lealone/storage/CursorParameters.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 public class CursorParameters {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/Storage.java b/lealone-common/src/main/java/com/lealone/storage/Storage.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/storage/Storage.java
rename to lealone-common/src/main/java/com/lealone/storage/Storage.java
index 0a1eba828..0ae7935f5 100644
--- a/lealone-common/src/main/java/org/lealone/storage/Storage.java
+++ b/lealone-common/src/main/java/com/lealone/storage/Storage.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.zip.ZipOutputStream;
 
-import org.lealone.db.scheduler.SchedulerFactory;
-import org.lealone.storage.type.ObjectDataType;
-import org.lealone.storage.type.StorageDataType;
+import com.lealone.db.scheduler.SchedulerFactory;
+import com.lealone.storage.type.ObjectDataType;
+import com.lealone.storage.type.StorageDataType;
 
 public interface Storage {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageBase.java b/lealone-common/src/main/java/com/lealone/storage/StorageBase.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/storage/StorageBase.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageBase.java
index 869e40f4b..623cbc393 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageBase.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,12 +15,12 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.scheduler.SchedulerFactory;
-import org.lealone.storage.fs.FilePath;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.scheduler.SchedulerFactory;
+import com.lealone.storage.fs.FilePath;
+import com.lealone.storage.fs.FileUtils;
 
 //子类通常只需要实现openMap方法
 public abstract class StorageBase implements Storage {
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageBuilder.java b/lealone-common/src/main/java/com/lealone/storage/StorageBuilder.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/storage/StorageBuilder.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageBuilder.java
index a39a0c101..4b00b4443 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageBuilder.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageBuilder.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 import java.util.HashMap;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DbSetting;
-import org.lealone.db.scheduler.SchedulerFactory;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DbSetting;
+import com.lealone.db.scheduler.SchedulerFactory;
 
 /**
  * A storage builder.
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageEngine.java b/lealone-common/src/main/java/com/lealone/storage/StorageEngine.java
similarity index 75%
rename from lealone-common/src/main/java/org/lealone/storage/StorageEngine.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageEngine.java
index b9ba4aec6..2c1442e68 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageEngine.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageEngine.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.PluggableEngine;
-import org.lealone.db.PluginManager;
-import org.lealone.db.scheduler.SchedulerFactory;
-import org.lealone.storage.lob.LobStorage;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.PluggableEngine;
+import com.lealone.db.PluginManager;
+import com.lealone.db.scheduler.SchedulerFactory;
+import com.lealone.storage.lob.LobStorage;
 
 public interface StorageEngine extends PluggableEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageEngineBase.java b/lealone-common/src/main/java/com/lealone/storage/StorageEngineBase.java
similarity index 71%
rename from lealone-common/src/main/java/org/lealone/storage/StorageEngineBase.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageEngineBase.java
index 3c5876974..07624571f 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageEngineBase.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageEngineBase.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DataHandler;
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
-import org.lealone.storage.lob.LobStorage;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DataHandler;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
+import com.lealone.storage.lob.LobStorage;
 
 public abstract class StorageEngineBase extends PluginBase implements StorageEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageEventListener.java b/lealone-common/src/main/java/com/lealone/storage/StorageEventListener.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/storage/StorageEventListener.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageEventListener.java
index 646b419d8..9e34c71be 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageEventListener.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageEventListener.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 public interface StorageEventListener {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageMap.java b/lealone-common/src/main/java/com/lealone/storage/StorageMap.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/storage/StorageMap.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageMap.java
index bbebec723..045993a82 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageMap.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageMap.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.async.Future;
-import org.lealone.db.session.Session;
-import org.lealone.storage.type.StorageDataType;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.async.Future;
+import com.lealone.db.session.Session;
+import com.lealone.storage.type.StorageDataType;
+import com.lealone.transaction.TransactionEngine;
 
 public interface StorageMap {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageMapBase.java b/lealone-common/src/main/java/com/lealone/storage/StorageMapBase.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/storage/StorageMapBase.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageMapBase.java
index 0a73a7d67..b1266756f 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageMapBase.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageMapBase.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.value.ValueLong;
-import org.lealone.storage.type.ObjectDataType;
-import org.lealone.storage.type.StorageDataType;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.value.ValueLong;
+import com.lealone.storage.type.ObjectDataType;
+import com.lealone.storage.type.StorageDataType;
 
 public abstract class StorageMapBase implements StorageMap {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageMapCursor.java b/lealone-common/src/main/java/com/lealone/storage/StorageMapCursor.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/storage/StorageMapCursor.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageMapCursor.java
index cd650bc17..c52ae18b6 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageMapCursor.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageMapCursor.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 import java.util.Objects;
 import java.util.function.Consumer;
 
-import org.lealone.storage.page.IPage;
+import com.lealone.storage.page.IPage;
 
 public interface StorageMapCursor {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/StorageSetting.java b/lealone-common/src/main/java/com/lealone/storage/StorageSetting.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/storage/StorageSetting.java
rename to lealone-common/src/main/java/com/lealone/storage/StorageSetting.java
index 83172159e..e40cb6da4 100644
--- a/lealone-common/src/main/java/org/lealone/storage/StorageSetting.java
+++ b/lealone-common/src/main/java/com/lealone/storage/StorageSetting.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage;
+package com.lealone.storage;
 
 public enum StorageSetting {
     STORAGE_PATH,
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/FilePath.java b/lealone-common/src/main/java/com/lealone/storage/fs/FilePath.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/storage/fs/FilePath.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/FilePath.java
index 86c0b3b0c..fbf6ba6b7 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/FilePath.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/FilePath.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs;
+package com.lealone.storage.fs;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,9 +14,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.storage.fs.impl.FilePathWrapper;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.storage.fs.impl.FilePathWrapper;
 
 /**
  * A path to a file. It similar to the Java 7 java.nio.file.Path,
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/FileStorage.java b/lealone-common/src/main/java/com/lealone/storage/fs/FileStorage.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/storage/fs/FileStorage.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/FileStorage.java
index 0f2137f48..6fa75de04 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/FileStorage.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/FileStorage.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs;
+package com.lealone.storage.fs;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,17 +14,17 @@
 import java.nio.channels.OverlappingFileLockException;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.TempFileDeleter;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.SysProperties;
-import org.lealone.storage.fs.impl.disk.FilePathDisk;
-import org.lealone.storage.fs.impl.encrypt.FileEncrypt;
-import org.lealone.storage.fs.impl.encrypt.FilePathEncrypt;
-import org.lealone.storage.fs.impl.nio.FilePathNio;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.TempFileDeleter;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.SysProperties;
+import com.lealone.storage.fs.impl.disk.FilePathDisk;
+import com.lealone.storage.fs.impl.encrypt.FileEncrypt;
+import com.lealone.storage.fs.impl.encrypt.FilePathEncrypt;
+import com.lealone.storage.fs.impl.nio.FilePathNio;
 
 /**
  * This class is an abstraction of a random access file.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/FileStorageInputStream.java b/lealone-common/src/main/java/com/lealone/storage/fs/FileStorageInputStream.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/storage/fs/FileStorageInputStream.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/FileStorageInputStream.java
index f428f93d8..1f20b0798 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/FileStorageInputStream.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/FileStorageInputStream.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs;
+package com.lealone.storage.fs;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.lealone.common.compress.CompressTool;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataHandler;
+import com.lealone.common.compress.CompressTool;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataHandler;
 
 /**
  * An input stream that is backed by a file storage.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/FileStorageOutputStream.java b/lealone-common/src/main/java/com/lealone/storage/fs/FileStorageOutputStream.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/storage/fs/FileStorageOutputStream.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/FileStorageOutputStream.java
index 828286323..bb24f1126 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/FileStorageOutputStream.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/FileStorageOutputStream.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs;
+package com.lealone.storage.fs;
 
 import java.io.OutputStream;
 
-import org.lealone.common.compress.CompressTool;
-import org.lealone.db.Constants;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataHandler;
+import com.lealone.common.compress.CompressTool;
+import com.lealone.db.Constants;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataHandler;
 
 /**
  * An output stream that is backed by a file storage.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/FileUtils.java b/lealone-common/src/main/java/com/lealone/storage/fs/FileUtils.java
similarity index 99%
rename from lealone-common/src/main/java/org/lealone/storage/fs/FileUtils.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/FileUtils.java
index a1ebabb66..9a565f859 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/FileUtils.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/FileUtils.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs;
+package com.lealone.storage.fs;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FileBase.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FileBase.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/FileBase.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/FileBase.java
index 9149837e9..e79a61942 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FileBase.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FileBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl;
+package com.lealone.storage.fs.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FileChannelInputStream.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FileChannelInputStream.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/FileChannelInputStream.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/FileChannelInputStream.java
index 7528c9f2c..686a772d0 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FileChannelInputStream.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FileChannelInputStream.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl;
+package com.lealone.storage.fs.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FileChannelOutputStream.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FileChannelOutputStream.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/FileChannelOutputStream.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/FileChannelOutputStream.java
index 62602e993..96538a437 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FileChannelOutputStream.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FileChannelOutputStream.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl;
+package com.lealone.storage.fs.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * Allows to write to a file channel like an output stream.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FilePathWrapper.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FilePathWrapper.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/FilePathWrapper.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/FilePathWrapper.java
index 6c32d658b..8b651d5af 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/FilePathWrapper.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/FilePathWrapper.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl;
+package com.lealone.storage.fs.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,7 +11,7 @@
 import java.nio.channels.FileChannel;
 import java.util.List;
 
-import org.lealone.storage.fs.FilePath;
+import com.lealone.storage.fs.FilePath;
 
 /**
  * The base class for wrapping / delegating file systems such as
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/disk/FileDisk.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/disk/FileDisk.java
similarity index 95%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/disk/FileDisk.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/disk/FileDisk.java
index cfca55de3..f12ca263f 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/disk/FileDisk.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/disk/FileDisk.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl.disk;
+package com.lealone.storage.fs.impl.disk;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -13,8 +13,8 @@
 import java.nio.channels.FileLock;
 import java.nio.channels.NonWritableChannelException;
 
-import org.lealone.db.SysProperties;
-import org.lealone.storage.fs.impl.FileBase;
+import com.lealone.db.SysProperties;
+import com.lealone.storage.fs.impl.FileBase;
 
 /**
  * Uses java.io.RandomAccessFile to access a file.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/disk/FilePathDisk.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/disk/FilePathDisk.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/disk/FilePathDisk.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/disk/FilePathDisk.java
index 1beab90e4..68878ea53 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/disk/FilePathDisk.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/disk/FilePathDisk.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl.disk;
+package com.lealone.storage.fs.impl.disk;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -18,12 +18,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.fs.FilePath;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.fs.FilePath;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * This file system stores files on disk.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/encrypt/FileEncrypt.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/encrypt/FileEncrypt.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/encrypt/FileEncrypt.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/encrypt/FileEncrypt.java
index 49d32c770..c23b7aa02 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/encrypt/FileEncrypt.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/encrypt/FileEncrypt.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl.encrypt;
+package com.lealone.storage.fs.impl.encrypt;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -12,16 +12,16 @@
 import java.nio.channels.FileLock;
 import java.util.Arrays;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.security.AES;
-import org.lealone.common.security.BlockCipher;
-import org.lealone.common.security.CipherFactory;
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.storage.fs.impl.FileBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.security.AES;
+import com.lealone.common.security.BlockCipher;
+import com.lealone.common.security.CipherFactory;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.storage.fs.impl.FileBase;
 
 /**
  * An encrypted file with a read cache.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java
index b54339781..c717914ca 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/encrypt/FilePathEncrypt.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl.encrypt;
+package com.lealone.storage.fs.impl.encrypt;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 
-import org.lealone.db.Constants;
-import org.lealone.storage.fs.FilePath;
-import org.lealone.storage.fs.FileUtils;
-import org.lealone.storage.fs.impl.FileChannelInputStream;
-import org.lealone.storage.fs.impl.FileChannelOutputStream;
-import org.lealone.storage.fs.impl.FilePathWrapper;
+import com.lealone.db.Constants;
+import com.lealone.storage.fs.FilePath;
+import com.lealone.storage.fs.FileUtils;
+import com.lealone.storage.fs.impl.FileChannelInputStream;
+import com.lealone.storage.fs.impl.FileChannelOutputStream;
+import com.lealone.storage.fs.impl.FilePathWrapper;
 
 /**
  * An encrypted file.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/nio/FileNio.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/nio/FileNio.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/nio/FileNio.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/nio/FileNio.java
index 6b9377c2b..a38278c22 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/nio/FileNio.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/nio/FileNio.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl.nio;
+package com.lealone.storage.fs.impl.nio;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -12,7 +12,7 @@
 import java.nio.channels.FileLock;
 import java.nio.channels.NonWritableChannelException;
 
-import org.lealone.storage.fs.impl.FileBase;
+import com.lealone.storage.fs.impl.FileBase;
 
 /**
  * File which uses NIO FileChannel.
diff --git a/lealone-common/src/main/java/org/lealone/storage/fs/impl/nio/FilePathNio.java b/lealone-common/src/main/java/com/lealone/storage/fs/impl/nio/FilePathNio.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/storage/fs/impl/nio/FilePathNio.java
rename to lealone-common/src/main/java/com/lealone/storage/fs/impl/nio/FilePathNio.java
index e7055a17b..1fd82cea6 100644
--- a/lealone-common/src/main/java/org/lealone/storage/fs/impl/nio/FilePathNio.java
+++ b/lealone-common/src/main/java/com/lealone/storage/fs/impl/nio/FilePathNio.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.fs.impl.nio;
+package com.lealone.storage.fs.impl.nio;
 
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 
-import org.lealone.storage.fs.impl.FilePathWrapper;
+import com.lealone.storage.fs.impl.FilePathWrapper;
 
 /**
  * This file system stores files on disk and uses java.nio to access the files.
diff --git a/lealone-common/src/main/java/org/lealone/storage/lob/LobLocalStorage.java b/lealone-common/src/main/java/com/lealone/storage/lob/LobLocalStorage.java
similarity index 96%
rename from lealone-common/src/main/java/org/lealone/storage/lob/LobLocalStorage.java
rename to lealone-common/src/main/java/com/lealone/storage/lob/LobLocalStorage.java
index 10d1adb4a..f61b8e557 100644
--- a/lealone-common/src/main/java/org/lealone/storage/lob/LobLocalStorage.java
+++ b/lealone-common/src/main/java/com/lealone/storage/lob/LobLocalStorage.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.lob;
+package com.lealone.storage.lob;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DataHandler;
-import org.lealone.db.value.ValueLob;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DataHandler;
+import com.lealone.db.value.ValueLob;
 
 /**
  * This factory creates in-memory objects and temporary files.
diff --git a/lealone-common/src/main/java/org/lealone/storage/lob/LobStorage.java b/lealone-common/src/main/java/com/lealone/storage/lob/LobStorage.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/storage/lob/LobStorage.java
rename to lealone-common/src/main/java/com/lealone/storage/lob/LobStorage.java
index 7d554539c..0e2e7d880 100644
--- a/lealone-common/src/main/java/org/lealone/storage/lob/LobStorage.java
+++ b/lealone-common/src/main/java/com/lealone/storage/lob/LobStorage.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.lob;
+package com.lealone.storage.lob;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.zip.ZipOutputStream;
 
-import org.lealone.db.value.ValueLob;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.db.value.ValueLob;
+import com.lealone.transaction.TransactionEngine;
 
 /**
  * A mechanism to store and retrieve lob data.
@@ -19,7 +19,7 @@
  * @author H2 Group
  * @author zhh
  */
-public interface LobStorage extends org.lealone.transaction.TransactionEngine.GcTask {
+public interface LobStorage extends com.lealone.transaction.TransactionEngine.GcTask {
 
     /**
      * The table id for session variables (LOBs not assigned to a table).
diff --git a/lealone-common/src/main/java/org/lealone/storage/page/IPage.java b/lealone-common/src/main/java/com/lealone/storage/page/IPage.java
similarity index 84%
rename from lealone-common/src/main/java/org/lealone/storage/page/IPage.java
rename to lealone-common/src/main/java/com/lealone/storage/page/IPage.java
index 8a69e4500..ede0c1ed2 100644
--- a/lealone-common/src/main/java/org/lealone/storage/page/IPage.java
+++ b/lealone-common/src/main/java/com/lealone/storage/page/IPage.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.page;
+package com.lealone.storage.page;
 
 public interface IPage {
     void markDirtyBottomUp();
diff --git a/lealone-common/src/main/java/org/lealone/storage/page/PageOperation.java b/lealone-common/src/main/java/com/lealone/storage/page/PageOperation.java
similarity index 83%
rename from lealone-common/src/main/java/org/lealone/storage/page/PageOperation.java
rename to lealone-common/src/main/java/com/lealone/storage/page/PageOperation.java
index 64e39c56a..a48ef6e1e 100644
--- a/lealone-common/src/main/java/org/lealone/storage/page/PageOperation.java
+++ b/lealone-common/src/main/java/com/lealone/storage/page/PageOperation.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.page;
+package com.lealone.storage.page;
 
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.Session;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.Session;
 
 public interface PageOperation {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/BigIntegerType.java b/lealone-common/src/main/java/com/lealone/storage/type/BigIntegerType.java
similarity index 94%
rename from lealone-common/src/main/java/org/lealone/storage/type/BigIntegerType.java
rename to lealone-common/src/main/java/com/lealone/storage/type/BigIntegerType.java
index 996961e39..78ff81535 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/BigIntegerType.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/BigIntegerType.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
 
 public class BigIntegerType extends StorageDataTypeBase {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/CharacterType.java b/lealone-common/src/main/java/com/lealone/storage/type/CharacterType.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/storage/type/CharacterType.java
rename to lealone-common/src/main/java/com/lealone/storage/type/CharacterType.java
index d5b144e20..252cc0271 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/CharacterType.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/CharacterType.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.db.DataBuffer;
+import com.lealone.db.DataBuffer;
 
 public class CharacterType extends StorageDataTypeBase {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/ObjectArrayType.java b/lealone-common/src/main/java/com/lealone/storage/type/ObjectArrayType.java
similarity index 98%
rename from lealone-common/src/main/java/org/lealone/storage/type/ObjectArrayType.java
rename to lealone-common/src/main/java/com/lealone/storage/type/ObjectArrayType.java
index 5a006417a..44515a760 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/ObjectArrayType.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/ObjectArrayType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
@@ -15,9 +15,9 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.value.ValueString;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.value.ValueString;
 
 public class ObjectArrayType extends StorageDataTypeBase {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/ObjectDataType.java b/lealone-common/src/main/java/com/lealone/storage/type/ObjectDataType.java
similarity index 91%
rename from lealone-common/src/main/java/org/lealone/storage/type/ObjectDataType.java
rename to lealone-common/src/main/java/com/lealone/storage/type/ObjectDataType.java
index 69be11449..d8661daeb 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/ObjectDataType.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/ObjectDataType.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -13,22 +13,22 @@
 import java.util.Date;
 import java.util.UUID;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
 
 /**
  * A data type implementation for the most common data types, including serializable objects.
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/SerializedObjectType.java b/lealone-common/src/main/java/com/lealone/storage/type/SerializedObjectType.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/storage/type/SerializedObjectType.java
rename to lealone-common/src/main/java/com/lealone/storage/type/SerializedObjectType.java
index 27c7595d3..cdae2ced0 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/SerializedObjectType.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/SerializedObjectType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -12,8 +12,8 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
 
 public class SerializedObjectType extends StorageDataTypeBase {
 
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/StorageDataType.java b/lealone-common/src/main/java/com/lealone/storage/type/StorageDataType.java
similarity index 97%
rename from lealone-common/src/main/java/org/lealone/storage/type/StorageDataType.java
rename to lealone-common/src/main/java/com/lealone/storage/type/StorageDataType.java
index cbee91646..5dae8232f 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/StorageDataType.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/StorageDataType.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
 
 /**
  * A data type.
diff --git a/lealone-common/src/main/java/org/lealone/storage/type/StorageDataTypeBase.java b/lealone-common/src/main/java/com/lealone/storage/type/StorageDataTypeBase.java
similarity index 86%
rename from lealone-common/src/main/java/org/lealone/storage/type/StorageDataTypeBase.java
rename to lealone-common/src/main/java/com/lealone/storage/type/StorageDataTypeBase.java
index 2da818bde..8d673aae8 100644
--- a/lealone-common/src/main/java/org/lealone/storage/type/StorageDataTypeBase.java
+++ b/lealone-common/src/main/java/com/lealone/storage/type/StorageDataTypeBase.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.storage.type;
+package com.lealone.storage.type;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.value.Value;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.value.Value;
 
 public abstract class StorageDataTypeBase implements StorageDataType {
 
diff --git a/lealone-common/src/main/java/org/lealone/transaction/ITransactionalValue.java b/lealone-common/src/main/java/com/lealone/transaction/ITransactionalValue.java
similarity index 85%
rename from lealone-common/src/main/java/org/lealone/transaction/ITransactionalValue.java
rename to lealone-common/src/main/java/com/lealone/transaction/ITransactionalValue.java
index 833558934..7249976d5 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/ITransactionalValue.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/ITransactionalValue.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
 public interface ITransactionalValue {
     Object getValue();
diff --git a/lealone-common/src/main/java/org/lealone/transaction/PendingTransaction.java b/lealone-common/src/main/java/com/lealone/transaction/PendingTransaction.java
similarity index 92%
rename from lealone-common/src/main/java/org/lealone/transaction/PendingTransaction.java
rename to lealone-common/src/main/java/com/lealone/transaction/PendingTransaction.java
index 6f4a10a31..666af78ab 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/PendingTransaction.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/PendingTransaction.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.lealone.db.link.LinkableBase;
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.db.link.LinkableBase;
+import com.lealone.db.scheduler.Scheduler;
 
 public class PendingTransaction extends LinkableBase {
 
diff --git a/lealone-common/src/main/java/org/lealone/transaction/Transaction.java b/lealone-common/src/main/java/com/lealone/transaction/Transaction.java
similarity index 90%
rename from lealone-common/src/main/java/org/lealone/transaction/Transaction.java
rename to lealone-common/src/main/java/com/lealone/transaction/Transaction.java
index 10fd65006..a38b94f7e 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/Transaction.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/Transaction.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
 import java.sql.Connection;
 import java.util.Map;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.Session;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.storage.Storage;
-import org.lealone.storage.type.StorageDataType;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.Session;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.storage.Storage;
+import com.lealone.storage.type.StorageDataType;
 
 public interface Transaction {
 
diff --git a/lealone-common/src/main/java/org/lealone/transaction/TransactionEngine.java b/lealone-common/src/main/java/com/lealone/transaction/TransactionEngine.java
similarity index 87%
rename from lealone-common/src/main/java/org/lealone/transaction/TransactionEngine.java
rename to lealone-common/src/main/java/com/lealone/transaction/TransactionEngine.java
index 6bd778caf..9399d1350 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/TransactionEngine.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/TransactionEngine.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
 import java.util.List;
 
-import org.lealone.db.Constants;
-import org.lealone.db.PluggableEngine;
-import org.lealone.db.PluginManager;
-import org.lealone.db.RunMode;
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.db.Constants;
+import com.lealone.db.PluggableEngine;
+import com.lealone.db.PluginManager;
+import com.lealone.db.RunMode;
+import com.lealone.db.scheduler.Scheduler;
 
 public interface TransactionEngine extends PluggableEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/transaction/TransactionEngineBase.java b/lealone-common/src/main/java/com/lealone/transaction/TransactionEngineBase.java
similarity index 84%
rename from lealone-common/src/main/java/org/lealone/transaction/TransactionEngineBase.java
rename to lealone-common/src/main/java/com/lealone/transaction/TransactionEngineBase.java
index b28b65c4d..cd4156dbf 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/TransactionEngineBase.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/TransactionEngineBase.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class TransactionEngineBase extends PluginBase implements TransactionEngine {
 
diff --git a/lealone-common/src/main/java/org/lealone/transaction/TransactionMap.java b/lealone-common/src/main/java/com/lealone/transaction/TransactionMap.java
similarity index 93%
rename from lealone-common/src/main/java/org/lealone/transaction/TransactionMap.java
rename to lealone-common/src/main/java/com/lealone/transaction/TransactionMap.java
index 323137800..d0e6347f3 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/TransactionMap.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/TransactionMap.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
-import org.lealone.db.async.Future;
-import org.lealone.storage.CursorParameters;
-import org.lealone.storage.StorageMap;
-import org.lealone.storage.type.StorageDataType;
+import com.lealone.db.async.Future;
+import com.lealone.storage.CursorParameters;
+import com.lealone.storage.StorageMap;
+import com.lealone.storage.type.StorageDataType;
 
 public interface TransactionMap extends StorageMap {
 
diff --git a/lealone-common/src/main/java/org/lealone/transaction/TransactionMapCursor.java b/lealone-common/src/main/java/com/lealone/transaction/TransactionMapCursor.java
similarity index 75%
rename from lealone-common/src/main/java/org/lealone/transaction/TransactionMapCursor.java
rename to lealone-common/src/main/java/com/lealone/transaction/TransactionMapCursor.java
index 14544253a..d8b106a47 100644
--- a/lealone-common/src/main/java/org/lealone/transaction/TransactionMapCursor.java
+++ b/lealone-common/src/main/java/com/lealone/transaction/TransactionMapCursor.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.transaction;
+package com.lealone.transaction;
 
-import org.lealone.storage.StorageMapCursor;
+import com.lealone.storage.StorageMapCursor;
 
 public interface TransactionMapCursor extends StorageMapCursor {
 
diff --git a/lealone-common/src/main/resources/org/lealone/common/resources/_messages_en.prop b/lealone-common/src/main/resources/com/lealone/common/resources/_messages_en.prop
similarity index 100%
rename from lealone-common/src/main/resources/org/lealone/common/resources/_messages_en.prop
rename to lealone-common/src/main/resources/com/lealone/common/resources/_messages_en.prop
diff --git a/lealone-common/src/main/resources/org/lealone/common/resources/_messages_zh.prop b/lealone-common/src/main/resources/com/lealone/common/resources/_messages_zh.prop
similarity index 100%
rename from lealone-common/src/main/resources/org/lealone/common/resources/_messages_zh.prop
rename to lealone-common/src/main/resources/com/lealone/common/resources/_messages_zh.prop
diff --git a/lealone-common/src/main/resources/org/lealone/common/resources/version.properties b/lealone-common/src/main/resources/com/lealone/common/resources/version.properties
similarity index 100%
rename from lealone-common/src/main/resources/org/lealone/common/resources/version.properties
rename to lealone-common/src/main/resources/com/lealone/common/resources/version.properties
diff --git a/lealone-db/pom.xml b/lealone-db/pom.xml
index a02c2fa5e..445b842ac 100644
--- a/lealone-db/pom.xml
+++ b/lealone-db/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-sci
             ${project.version}
         
diff --git a/lealone-db/src/main/java/org/lealone/db/Comment.java b/lealone-db/src/main/java/com/lealone/db/Comment.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/Comment.java
rename to lealone-db/src/main/java/com/lealone/db/Comment.java
index c1ad09fed..19426621f 100644
--- a/lealone-db/src/main/java/org/lealone/db/Comment.java
+++ b/lealone-db/src/main/java/com/lealone/db/Comment.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
 
 /**
  * Represents a database object comment.
diff --git a/lealone-db/src/main/java/org/lealone/db/Database.java b/lealone-db/src/main/java/com/lealone/db/Database.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/Database.java
rename to lealone-db/src/main/java/com/lealone/db/Database.java
index d2948e978..1c4dfa91c 100644
--- a/lealone-db/src/main/java/org/lealone/db/Database.java
+++ b/lealone-db/src/main/java/com/lealone/db/Database.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,61 +22,61 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.ZipOutputStream;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.common.util.BitField;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.ShutdownHookUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.TempFileDeleter;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.DatabaseEventListener;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.auth.Role;
-import org.lealone.db.auth.User;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerLock;
-import org.lealone.db.scheduler.SchedulerThread;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObject;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.schema.TriggerObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.db.stat.QueryStatisticsData;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.CreateTableData;
-import org.lealone.db.table.InfoMetaTable;
-import org.lealone.db.table.PerfMetaTable;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableAlterHistory;
-import org.lealone.db.table.TableView;
-import org.lealone.db.util.SourceCompiler;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.net.NetNode;
-import org.lealone.sql.SQLEngine;
-import org.lealone.sql.SQLParser;
-import org.lealone.storage.Storage;
-import org.lealone.storage.StorageBase;
-import org.lealone.storage.StorageBuilder;
-import org.lealone.storage.StorageEngine;
-import org.lealone.storage.StorageSetting;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.fs.FileUtils;
-import org.lealone.storage.lob.LobStorage;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.common.util.BitField;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.ShutdownHookUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.TempFileDeleter;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.DatabaseEventListener;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.auth.Role;
+import com.lealone.db.auth.User;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerLock;
+import com.lealone.db.scheduler.SchedulerThread;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObject;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.schema.TriggerObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.db.stat.QueryStatisticsData;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.CreateTableData;
+import com.lealone.db.table.InfoMetaTable;
+import com.lealone.db.table.PerfMetaTable;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableAlterHistory;
+import com.lealone.db.table.TableView;
+import com.lealone.db.util.SourceCompiler;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.net.NetNode;
+import com.lealone.sql.SQLEngine;
+import com.lealone.sql.SQLParser;
+import com.lealone.storage.Storage;
+import com.lealone.storage.StorageBase;
+import com.lealone.storage.StorageBuilder;
+import com.lealone.storage.StorageEngine;
+import com.lealone.storage.StorageSetting;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.fs.FileUtils;
+import com.lealone.storage.lob.LobStorage;
+import com.lealone.transaction.TransactionEngine;
 
 /**
  * There is one database object per open database.
diff --git a/lealone-db/src/main/java/org/lealone/db/DbObject.java b/lealone-db/src/main/java/com/lealone/db/DbObject.java
similarity index 95%
rename from lealone-db/src/main/java/org/lealone/db/DbObject.java
rename to lealone-db/src/main/java/com/lealone/db/DbObject.java
index 5a088dbb2..a87d84c92 100644
--- a/lealone-db/src/main/java/org/lealone/db/DbObject.java
+++ b/lealone-db/src/main/java/com/lealone/db/DbObject.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.List;
 
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
 
 /**
  * A database object such as a table, an index, or a user.
diff --git a/lealone-db/src/main/java/org/lealone/db/DbObjectBase.java b/lealone-db/src/main/java/com/lealone/db/DbObjectBase.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/DbObjectBase.java
rename to lealone-db/src/main/java/com/lealone/db/DbObjectBase.java
index 7639ff8e0..00ab0b7ac 100644
--- a/lealone-db/src/main/java/org/lealone/db/DbObjectBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/DbObjectBase.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.List;
 
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
 
 /**
  * The base class for all database objects.
diff --git a/lealone-db/src/main/java/org/lealone/db/DbObjectType.java b/lealone-db/src/main/java/com/lealone/db/DbObjectType.java
similarity index 99%
rename from lealone-db/src/main/java/org/lealone/db/DbObjectType.java
rename to lealone-db/src/main/java/com/lealone/db/DbObjectType.java
index 9ce2658cf..9570e95d5 100644
--- a/lealone-db/src/main/java/org/lealone/db/DbObjectType.java
+++ b/lealone-db/src/main/java/com/lealone/db/DbObjectType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/lealone-db/src/main/java/org/lealone/db/DbSettings.java b/lealone-db/src/main/java/com/lealone/db/DbSettings.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/DbSettings.java
rename to lealone-db/src/main/java/com/lealone/db/DbSettings.java
index 4114a7117..a435b659c 100644
--- a/lealone-db/src/main/java/org/lealone/db/DbSettings.java
+++ b/lealone-db/src/main/java/com/lealone/db/DbSettings.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.table.Table;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.table.Table;
 
 /**
  * This class contains various database-level settings. To override the
diff --git a/lealone-db/src/main/java/org/lealone/db/LealoneDatabase.java b/lealone-db/src/main/java/com/lealone/db/LealoneDatabase.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/LealoneDatabase.java
rename to lealone-db/src/main/java/com/lealone/db/LealoneDatabase.java
index 3e9c18f6f..b1e90af0e 100644
--- a/lealone-db/src/main/java/org/lealone/db/LealoneDatabase.java
+++ b/lealone-db/src/main/java/com/lealone/db/LealoneDatabase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,13 +11,13 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.transaction.TransactionEngine;
 
 /**
  * 最顶层的数据库，用于管理所有应用创建的数据库
@@ -25,7 +25,7 @@
  * @author zhh
  */
 public class LealoneDatabase extends Database
-        implements org.lealone.transaction.TransactionEngine.GcTask {
+        implements com.lealone.transaction.TransactionEngine.GcTask {
 
     // ID固定为0
     public static final int ID = 0;
diff --git a/lealone-db/src/main/java/org/lealone/db/MetaRecord.java b/lealone-db/src/main/java/com/lealone/db/MetaRecord.java
similarity index 86%
rename from lealone-db/src/main/java/org/lealone/db/MetaRecord.java
rename to lealone-db/src/main/java/com/lealone/db/MetaRecord.java
index c582fbee8..3427043b7 100644
--- a/lealone-db/src/main/java/org/lealone/db/MetaRecord.java
+++ b/lealone-db/src/main/java/com/lealone/db/MetaRecord.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.db.api.DatabaseEventListener;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.db.api.DatabaseEventListener;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.PreparedSQLStatement;
 
 /**
  * A record in the system table of the database.
diff --git a/lealone-db/src/main/java/org/lealone/db/Mode.java b/lealone-db/src/main/java/com/lealone/db/Mode.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/Mode.java
rename to lealone-db/src/main/java/com/lealone/db/Mode.java
index b3c25ba81..2fd652cd2 100644
--- a/lealone-db/src/main/java/org/lealone/db/Mode.java
+++ b/lealone-db/src/main/java/com/lealone/db/Mode.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
-import org.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.CaseInsensitiveMap;
 
 /**
  * The compatibility modes.
diff --git a/lealone-db/src/main/java/org/lealone/db/PluginObject.java b/lealone-db/src/main/java/com/lealone/db/PluginObject.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/PluginObject.java
rename to lealone-db/src/main/java/com/lealone/db/PluginObject.java
index aec1eff72..e1f3de10c 100644
--- a/lealone-db/src/main/java/org/lealone/db/PluginObject.java
+++ b/lealone-db/src/main/java/com/lealone/db/PluginObject.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.io.IOException;
 import java.net.URLClassLoader;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.StatementBuilder;
 
 /**
  * Represents a database plugin object.
diff --git a/lealone-db/src/main/java/org/lealone/db/Procedure.java b/lealone-db/src/main/java/com/lealone/db/Procedure.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/Procedure.java
rename to lealone-db/src/main/java/com/lealone/db/Procedure.java
index dc9af08b3..72c258b37 100644
--- a/lealone-db/src/main/java/org/lealone/db/Procedure.java
+++ b/lealone-db/src/main/java/com/lealone/db/Procedure.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db;
+package com.lealone.db;
 
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.PreparedSQLStatement;
 
 /**
  * Represents a procedure. Procedures are implemented for PostgreSQL compatibility.
diff --git a/lealone-db/src/main/java/org/lealone/db/TransactionalDbObjects.java b/lealone-db/src/main/java/com/lealone/db/TransactionalDbObjects.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/TransactionalDbObjects.java
rename to lealone-db/src/main/java/com/lealone/db/TransactionalDbObjects.java
index c7a0df045..fa65aa781 100644
--- a/lealone-db/src/main/java/org/lealone/db/TransactionalDbObjects.java
+++ b/lealone-db/src/main/java/com/lealone/db/TransactionalDbObjects.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db;
+package com.lealone.db;
 
 import java.util.HashMap;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.session.ServerSession;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.session.ServerSession;
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionEngine;
 
 //只存放同一种DbObject的多个实例，支持多版本
 //需要配合DbObjectLock使用，只允许一个事务修改
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/PasswordHash.java b/lealone-db/src/main/java/com/lealone/db/auth/PasswordHash.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/auth/PasswordHash.java
rename to lealone-db/src/main/java/com/lealone/db/auth/PasswordHash.java
index f7b19e8b8..b4a01c257 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/PasswordHash.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/PasswordHash.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.auth;
+package com.lealone.db.auth;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.Utils;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Mode;
-import org.lealone.db.auth.scram.ScramPasswordHash;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.Utils;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Mode;
+import com.lealone.db.auth.scram.ScramPasswordHash;
 
 public class PasswordHash {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/Right.java b/lealone-db/src/main/java/com/lealone/db/auth/Right.java
similarity index 92%
rename from lealone-db/src/main/java/org/lealone/db/auth/Right.java
rename to lealone-db/src/main/java/com/lealone/db/auth/Right.java
index e81656aab..44bdb4222 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/Right.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/Right.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.auth;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectBase;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
+package com.lealone.db.auth;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectBase;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
 
 /**
  * An access right. Rights are regular database objects, but have generated
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/RightOwner.java b/lealone-db/src/main/java/com/lealone/db/auth/RightOwner.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/auth/RightOwner.java
rename to lealone-db/src/main/java/com/lealone/db/auth/RightOwner.java
index 55f0a4d22..91883a0be 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/RightOwner.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/RightOwner.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.auth;
+package com.lealone.db.auth;
 
 import java.util.HashMap;
 
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectBase;
-import org.lealone.db.schema.SchemaObject;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectBase;
+import com.lealone.db.schema.SchemaObject;
 
 /**
  * A right owner (sometimes called principal).
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/Role.java b/lealone-db/src/main/java/com/lealone/db/auth/Role.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/auth/Role.java
rename to lealone-db/src/main/java/com/lealone/db/auth/Role.java
index 4cfa09772..abcfcd707 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/Role.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/Role.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.auth;
+package com.lealone.db.auth;
 
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
 
 /**
  * Represents a role. Roles can be granted to users, and to other roles.
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/User.java b/lealone-db/src/main/java/com/lealone/db/auth/User.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/auth/User.java
rename to lealone-db/src/main/java/com/lealone/db/auth/User.java
index 6579f7f32..e3190a8bf 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/User.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/User.java
@@ -3,30 +3,30 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.auth;
+package com.lealone.db.auth;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.Mode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.MetaTable;
-import org.lealone.db.table.RangeTable;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableType;
-import org.lealone.db.table.TableView;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.Mode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.MetaTable;
+import com.lealone.db.table.RangeTable;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableType;
+import com.lealone.db.table.TableView;
 
 /**
  * Represents a user object.
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/scram/ScramPasswordData.java b/lealone-db/src/main/java/com/lealone/db/auth/scram/ScramPasswordData.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/auth/scram/ScramPasswordData.java
rename to lealone-db/src/main/java/com/lealone/db/auth/scram/ScramPasswordData.java
index acaabdcd6..b89bfd3af 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/scram/ScramPasswordData.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/scram/ScramPasswordData.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.auth.scram;
+package com.lealone.db.auth.scram;
 
 public class ScramPasswordData {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/auth/scram/ScramPasswordHash.java b/lealone-db/src/main/java/com/lealone/db/auth/scram/ScramPasswordHash.java
similarity index 97%
rename from lealone-db/src/main/java/org/lealone/db/auth/scram/ScramPasswordHash.java
rename to lealone-db/src/main/java/com/lealone/db/auth/scram/ScramPasswordHash.java
index 0e48d6309..7309d602f 100644
--- a/lealone-db/src/main/java/org/lealone/db/auth/scram/ScramPasswordHash.java
+++ b/lealone-db/src/main/java/com/lealone/db/auth/scram/ScramPasswordHash.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.auth.scram;
+package com.lealone.db.auth.scram;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -16,8 +16,8 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.auth.User;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.auth.User;
 
 public class ScramPasswordHash {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/constraint/Constraint.java b/lealone-db/src/main/java/com/lealone/db/constraint/Constraint.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/constraint/Constraint.java
rename to lealone-db/src/main/java/com/lealone/db/constraint/Constraint.java
index 323babdb1..321025688 100644
--- a/lealone-db/src/main/java/org/lealone/db/constraint/Constraint.java
+++ b/lealone-db/src/main/java/com/lealone/db/constraint/Constraint.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.constraint;
+package com.lealone.db.constraint;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.Row;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObjectBase;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.Row;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObjectBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
 
 /**
  * The base class for constraint checking.
diff --git a/lealone-db/src/main/java/org/lealone/db/constraint/ConstraintCheck.java b/lealone-db/src/main/java/com/lealone/db/constraint/ConstraintCheck.java
similarity index 87%
rename from lealone-db/src/main/java/org/lealone/db/constraint/ConstraintCheck.java
rename to lealone-db/src/main/java/com/lealone/db/constraint/ConstraintCheck.java
index 24c059961..5ddc4e925 100644
--- a/lealone-db/src/main/java/org/lealone/db/constraint/ConstraintCheck.java
+++ b/lealone-db/src/main/java/com/lealone/db/constraint/ConstraintCheck.java
@@ -3,26 +3,26 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.constraint;
+package com.lealone.db.constraint;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.DbObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.index.Index;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.Row;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.sql.IExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.DbObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.index.Index;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.Row;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.sql.IExpression;
 
 /**
  * A check constraint.
diff --git a/lealone-db/src/main/java/org/lealone/db/constraint/ConstraintReferential.java b/lealone-db/src/main/java/com/lealone/db/constraint/ConstraintReferential.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/constraint/ConstraintReferential.java
rename to lealone-db/src/main/java/com/lealone/db/constraint/ConstraintReferential.java
index 02aa8a8b0..73fdd99fa 100644
--- a/lealone-db/src/main/java/org/lealone/db/constraint/ConstraintReferential.java
+++ b/lealone-db/src/main/java/com/lealone/db/constraint/ConstraintReferential.java
@@ -3,31 +3,31 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.constraint;
+package com.lealone.db.constraint;
 
 import java.util.HashSet;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.PreparedSQLStatement;
 
 /**
  * A referential constraint.
diff --git a/lealone-db/src/main/java/org/lealone/db/constraint/ConstraintUnique.java b/lealone-db/src/main/java/com/lealone/db/constraint/ConstraintUnique.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/constraint/ConstraintUnique.java
rename to lealone-db/src/main/java/com/lealone/db/constraint/ConstraintUnique.java
index b7f91ae1a..01a2e163f 100644
--- a/lealone-db/src/main/java/org/lealone/db/constraint/ConstraintUnique.java
+++ b/lealone-db/src/main/java/com/lealone/db/constraint/ConstraintUnique.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.constraint;
+package com.lealone.db.constraint;
 
 import java.util.HashSet;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
 
 /**
  * A unique constraint. This object always backed by a unique index.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/Cursor.java b/lealone-db/src/main/java/com/lealone/db/index/Cursor.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/index/Cursor.java
rename to lealone-db/src/main/java/com/lealone/db/index/Cursor.java
index 3f9aad9de..646e0b82a 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/Cursor.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/Cursor.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
 
 /**
  * A cursor is a helper object to iterate through an index.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/Index.java b/lealone-db/src/main/java/com/lealone/db/index/Index.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/index/Index.java
rename to lealone-db/src/main/java/com/lealone/db/index/Index.java
index 684916c05..3063b25ba 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/Index.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/Index.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.schema.SchemaObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.storage.CursorParameters;
+package com.lealone.db.index;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.schema.SchemaObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.storage.CursorParameters;
 
 /**
  * An index. Indexes are used to speed up searching data.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/IndexBase.java b/lealone-db/src/main/java/com/lealone/db/index/IndexBase.java
similarity index 95%
rename from lealone-db/src/main/java/org/lealone/db/index/IndexBase.java
rename to lealone-db/src/main/java/com/lealone/db/index/IndexBase.java
index 1ae04f510..4e14b7817 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/IndexBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/IndexBase.java
@@ -3,24 +3,24 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.schema.SchemaObjectBase;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.storage.CursorParameters;
+package com.lealone.db.index;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.schema.SchemaObjectBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.storage.CursorParameters;
 
 /**
  * Most index implementations extend the base index.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/IndexColumn.java b/lealone-db/src/main/java/com/lealone/db/index/IndexColumn.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/index/IndexColumn.java
rename to lealone-db/src/main/java/com/lealone/db/index/IndexColumn.java
index 25c41c3b0..6cddbf8de 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/IndexColumn.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/IndexColumn.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
 
 /**
  * This represents a column item of an index. This is required because some
diff --git a/lealone-db/src/main/java/org/lealone/db/index/IndexConditionType.java b/lealone-db/src/main/java/com/lealone/db/index/IndexConditionType.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/index/IndexConditionType.java
rename to lealone-db/src/main/java/com/lealone/db/index/IndexConditionType.java
index 3a64165d3..daff84a24 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/IndexConditionType.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/IndexConditionType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
 public class IndexConditionType {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/index/IndexRebuilder.java b/lealone-db/src/main/java/com/lealone/db/index/IndexRebuilder.java
similarity index 84%
rename from lealone-db/src/main/java/org/lealone/db/index/IndexRebuilder.java
rename to lealone-db/src/main/java/com/lealone/db/index/IndexRebuilder.java
index 78feb41e6..e4ec60d2b 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/IndexRebuilder.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/IndexRebuilder.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.Database;
-import org.lealone.db.api.DatabaseEventListener;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.Database;
+import com.lealone.db.api.DatabaseEventListener;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
 
 /**
  * @author H2 Group
diff --git a/lealone-db/src/main/java/org/lealone/db/index/IndexType.java b/lealone-db/src/main/java/com/lealone/db/index/IndexType.java
similarity index 99%
rename from lealone-db/src/main/java/org/lealone/db/index/IndexType.java
rename to lealone-db/src/main/java/com/lealone/db/index/IndexType.java
index 086fb7ccb..e72a49e18 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/IndexType.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/IndexType.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
 /**
  * Represents information about the properties of an index
diff --git a/lealone-db/src/main/java/org/lealone/db/index/MetaIndex.java b/lealone-db/src/main/java/com/lealone/db/index/MetaIndex.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/index/MetaIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/MetaIndex.java
index 084c6cd20..05513740b 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/MetaIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/MetaIndex.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
 import java.util.ArrayList;
 
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.MetaTable;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.MetaTable;
 
 /**
  * The index implementation for meta data tables.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/RangeIndex.java b/lealone-db/src/main/java/com/lealone/db/index/RangeIndex.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/index/RangeIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/RangeIndex.java
index 63c221280..c31279cf0 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/RangeIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/RangeIndex.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.RangeTable;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
+package com.lealone.db.index;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.RangeTable;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
 
 /**
  * An index for the SYSTEM_RANGE table.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/ViewIndex.java b/lealone-db/src/main/java/com/lealone/db/index/ViewIndex.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/index/ViewIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/ViewIndex.java
index 836a46711..ba87d8c93 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/ViewIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/ViewIndex.java
@@ -3,32 +3,32 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index;
+package com.lealone.db.index;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.SmallLRUCache;
-import org.lealone.common.util.Utils;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableView;
-import org.lealone.db.util.IntArray;
-import org.lealone.db.util.SynchronizedVerifier;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IQuery;
-import org.lealone.sql.ISelectUnion;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.SmallLRUCache;
+import com.lealone.common.util.Utils;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableView;
+import com.lealone.db.util.IntArray;
+import com.lealone.db.util.SynchronizedVerifier;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IQuery;
+import com.lealone.sql.ISelectUnion;
 
 /**
  * This object represents a virtual index for a query.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/hash/HashIndex.java b/lealone-db/src/main/java/com/lealone/db/index/hash/HashIndex.java
similarity index 82%
rename from lealone-db/src/main/java/org/lealone/db/index/hash/HashIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/hash/HashIndex.java
index baa30981b..b91da33c3 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/hash/HashIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/hash/HashIndex.java
@@ -3,19 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.hash;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.index.IndexBase;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexConditionType;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
+package com.lealone.db.index.hash;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.index.IndexBase;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexConditionType;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
 
 public abstract class HashIndex extends IndexBase {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/index/hash/NonUniqueHashIndex.java b/lealone-db/src/main/java/com/lealone/db/index/hash/NonUniqueHashIndex.java
similarity index 89%
rename from lealone-db/src/main/java/org/lealone/db/index/hash/NonUniqueHashIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/hash/NonUniqueHashIndex.java
index 43a7360ca..af7317023 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/hash/NonUniqueHashIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/hash/NonUniqueHashIndex.java
@@ -3,24 +3,24 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index.hash;
+package com.lealone.db.index.hash;
 
 import java.util.ArrayList;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.lealone.common.util.Utils;
-import org.lealone.db.async.Future;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.Value;
-import org.lealone.transaction.Transaction;
+import com.lealone.common.util.Utils;
+import com.lealone.db.async.Future;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.Value;
+import com.lealone.transaction.Transaction;
 
 /**
  * A non-unique index based on an in-memory hash map.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/hash/UniqueHashIndex.java b/lealone-db/src/main/java/com/lealone/db/index/hash/UniqueHashIndex.java
similarity index 85%
rename from lealone-db/src/main/java/org/lealone/db/index/hash/UniqueHashIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/hash/UniqueHashIndex.java
index e4b156e0c..abd610070 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/hash/UniqueHashIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/hash/UniqueHashIndex.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index.hash;
+package com.lealone.db.index.hash;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.lealone.db.async.Future;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.transaction.Transaction;
+import com.lealone.db.async.Future;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.transaction.Transaction;
 
 /**
  * An unique index based on an in-memory hash map.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/IndexKey.java b/lealone-db/src/main/java/com/lealone/db/index/standard/IndexKey.java
similarity index 83%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/IndexKey.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/IndexKey.java
index b87cac2bd..8a10773de 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/IndexKey.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/IndexKey.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.util.Arrays;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 public class IndexKey {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/IndexKeyType.java b/lealone-db/src/main/java/com/lealone/db/index/standard/IndexKeyType.java
similarity index 86%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/IndexKeyType.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/IndexKeyType.java
index 3f36be3d1..3eccb6c9a 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/IndexKeyType.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/IndexKeyType.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataHandler;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataHandler;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
 
 public class IndexKeyType extends ValueDataType {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardDelegateIndex.java b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardDelegateIndex.java
similarity index 84%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/StandardDelegateIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/StandardDelegateIndex.java
index f82163143..c247df4ca 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardDelegateIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardDelegateIndex.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index.standard;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.StandardTable;
-import org.lealone.db.value.ValueLong;
-import org.lealone.storage.CursorParameters;
+package com.lealone.db.index.standard;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.StandardTable;
+import com.lealone.db.value.ValueLong;
+import com.lealone.storage.CursorParameters;
 
 /**
  * An index that delegates indexing to another index.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardIndex.java b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardIndex.java
similarity index 69%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/StandardIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/StandardIndex.java
index 29a3a2a63..931c25382 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardIndex.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
-import org.lealone.db.index.IndexBase;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.StandardTable;
+import com.lealone.db.index.IndexBase;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.StandardTable;
 
 public abstract class StandardIndex extends IndexBase {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardPrimaryIndex.java b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardPrimaryIndex.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/StandardPrimaryIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/StandardPrimaryIndex.java
index 3098af0f2..ed1535fdf 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardPrimaryIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardPrimaryIndex.java
@@ -3,39 +3,39 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.RunMode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.StandardTable;
-import org.lealone.db.table.TableAlterHistoryRecord;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLob;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.storage.CursorParameters;
-import org.lealone.storage.Storage;
-import org.lealone.storage.page.IPage;
-import org.lealone.transaction.ITransactionalValue;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionEngine;
-import org.lealone.transaction.TransactionMap;
-import org.lealone.transaction.TransactionMapCursor;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.RunMode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.StandardTable;
+import com.lealone.db.table.TableAlterHistoryRecord;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLob;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.storage.CursorParameters;
+import com.lealone.storage.Storage;
+import com.lealone.storage.page.IPage;
+import com.lealone.transaction.ITransactionalValue;
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionEngine;
+import com.lealone.transaction.TransactionMap;
+import com.lealone.transaction.TransactionMapCursor;
 
 /**
  * @author H2 Group
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardSecondaryIndex.java b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardSecondaryIndex.java
similarity index 92%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/StandardSecondaryIndex.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/StandardSecondaryIndex.java
index bf1b466dd..b73c1bcb3 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/StandardSecondaryIndex.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/StandardSecondaryIndex.java
@@ -3,33 +3,33 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.StandardTable;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueEnum;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.storage.Storage;
-import org.lealone.storage.StorageSetting;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
-import org.lealone.transaction.TransactionMapCursor;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.StandardTable;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueEnum;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.storage.Storage;
+import com.lealone.storage.StorageSetting;
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
+import com.lealone.transaction.TransactionMapCursor;
 
 /**
  * @author H2 Group
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/UniqueKeyType.java b/lealone-db/src/main/java/com/lealone/db/index/standard/UniqueKeyType.java
similarity index 84%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/UniqueKeyType.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/UniqueKeyType.java
index 8dc8599d9..085321835 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/UniqueKeyType.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/UniqueKeyType.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
-import org.lealone.db.DataHandler;
-import org.lealone.db.value.CompareMode;
+import com.lealone.db.DataHandler;
+import com.lealone.db.value.CompareMode;
 
 /**
  * 用于优化唯一性检查，包括唯一约束、多字段primary key以及非byte/short/int/long类型的单字段primary key
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/ValueDataType.java b/lealone-db/src/main/java/com/lealone/db/index/standard/ValueDataType.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/ValueDataType.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/ValueDataType.java
index bd42c8989..01ac83af1 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/ValueDataType.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/ValueDataType.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataHandler;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.storage.type.StorageDataType;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataHandler;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.storage.type.StorageDataType;
 
 /**
  * A row type.
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/VersionedValue.java b/lealone-db/src/main/java/com/lealone/db/index/standard/VersionedValue.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/VersionedValue.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/VersionedValue.java
index 2ce042c95..e6c9cb70c 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/VersionedValue.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/VersionedValue.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.util.Arrays;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 public class VersionedValue {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/index/standard/VersionedValueType.java b/lealone-db/src/main/java/com/lealone/db/index/standard/VersionedValueType.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/index/standard/VersionedValueType.java
rename to lealone-db/src/main/java/com/lealone/db/index/standard/VersionedValueType.java
index feaf6288d..86a2ba4be 100644
--- a/lealone-db/src/main/java/org/lealone/db/index/standard/VersionedValueType.java
+++ b/lealone-db/src/main/java/com/lealone/db/index/standard/VersionedValueType.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.index.standard;
+package com.lealone.db.index.standard;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.common.util.DataUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataHandler;
-import org.lealone.db.table.Column.EnumColumn;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
+import com.lealone.common.util.DataUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataHandler;
+import com.lealone.db.table.Column.EnumColumn;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
 
 public class VersionedValueType extends ValueDataType {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/lock/DbObjectLock.java b/lealone-db/src/main/java/com/lealone/db/lock/DbObjectLock.java
similarity index 87%
rename from lealone-db/src/main/java/org/lealone/db/lock/DbObjectLock.java
rename to lealone-db/src/main/java/com/lealone/db/lock/DbObjectLock.java
index 7560cb4a8..fa5f92d05 100644
--- a/lealone-db/src/main/java/org/lealone/db/lock/DbObjectLock.java
+++ b/lealone-db/src/main/java/com/lealone/db/lock/DbObjectLock.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.lock;
+package com.lealone.db.lock;
 
 import java.util.ArrayList;
 
-import org.lealone.db.DbObjectType;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
 
 //数据库对象模型已经支持多版本，所以对象锁只需要像行锁一样实现即可
 public class DbObjectLock extends Lock {
diff --git a/lealone-db/src/main/java/org/lealone/db/result/DelegatedResult.java b/lealone-db/src/main/java/com/lealone/db/result/DelegatedResult.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/result/DelegatedResult.java
rename to lealone-db/src/main/java/com/lealone/db/result/DelegatedResult.java
index 1aa6f3ba7..349f2ffbe 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/DelegatedResult.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/DelegatedResult.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 public class DelegatedResult implements Result {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/result/LocalResult.java b/lealone-db/src/main/java/com/lealone/db/result/LocalResult.java
similarity index 97%
rename from lealone-db/src/main/java/org/lealone/db/result/LocalResult.java
rename to lealone-db/src/main/java/com/lealone/db/result/LocalResult.java
index 7d51de42a..9f83bf21e 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/LocalResult.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/LocalResult.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.sql.IExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.sql.IExpression;
 
 /**
  * A local result set contains all row data of a result set.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/ResultExternal.java b/lealone-db/src/main/java/com/lealone/db/result/ResultExternal.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/result/ResultExternal.java
rename to lealone-db/src/main/java/com/lealone/db/result/ResultExternal.java
index 3c81a4325..fe0251293 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/ResultExternal.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/ResultExternal.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 import java.util.ArrayList;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 /**
  * This interface is used to extend the LocalResult class, if data does not fit in memory.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/ResultTarget.java b/lealone-db/src/main/java/com/lealone/db/result/ResultTarget.java
similarity index 89%
rename from lealone-db/src/main/java/org/lealone/db/result/ResultTarget.java
rename to lealone-db/src/main/java/com/lealone/db/result/ResultTarget.java
index 83f074048..30e53fc63 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/ResultTarget.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/ResultTarget.java
@@ -4,9 +4,9 @@
  * (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 /**
  * A object where rows are written to.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/ResultTempTable.java b/lealone-db/src/main/java/com/lealone/db/result/ResultTempTable.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/result/ResultTempTable.java
rename to lealone-db/src/main/java/com/lealone/db/result/ResultTempTable.java
index c8f453f3e..b32c7b8db 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/ResultTempTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/ResultTempTable.java
@@ -3,25 +3,25 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.CreateTableData;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IExpression;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.CreateTableData;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IExpression;
 
 /**
  * This class implements the temp table buffer for the LocalResult class.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/Row.java b/lealone-db/src/main/java/com/lealone/db/result/Row.java
similarity index 84%
rename from lealone-db/src/main/java/org/lealone/db/result/Row.java
rename to lealone-db/src/main/java/com/lealone/db/result/Row.java
index 80c42cdbb..4f34f451b 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/Row.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/Row.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.storage.page.IPage;
-import org.lealone.transaction.ITransactionalValue;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.storage.page.IPage;
+import com.lealone.transaction.ITransactionalValue;
 
 /**
  * Represents a row in a table.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/RowBase.java b/lealone-db/src/main/java/com/lealone/db/result/RowBase.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/result/RowBase.java
rename to lealone-db/src/main/java/com/lealone/db/result/RowBase.java
index ff1777cf8..c3eaacc84 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/RowBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/RowBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 public abstract class RowBase implements SearchRow {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/result/SearchRow.java b/lealone-db/src/main/java/com/lealone/db/result/SearchRow.java
similarity index 95%
rename from lealone-db/src/main/java/org/lealone/db/result/SearchRow.java
rename to lealone-db/src/main/java/com/lealone/db/result/SearchRow.java
index e8b95fcc8..7c41b8ce1 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/SearchRow.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/SearchRow.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 /**
  * The interface for rows stored in a table, and for partial rows stored in the index.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/SimpleRow.java b/lealone-db/src/main/java/com/lealone/db/result/SimpleRow.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/result/SimpleRow.java
rename to lealone-db/src/main/java/com/lealone/db/result/SimpleRow.java
index c08dd4414..3f77edcab 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/SimpleRow.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/SimpleRow.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
-import org.lealone.db.value.Value;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
+import com.lealone.db.value.Value;
 
 /**
  * Represents a simple row without state.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/SimpleRowValue.java b/lealone-db/src/main/java/com/lealone/db/result/SimpleRowValue.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/result/SimpleRowValue.java
rename to lealone-db/src/main/java/com/lealone/db/result/SimpleRowValue.java
index 321b4385a..dd9459556 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/SimpleRowValue.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/SimpleRowValue.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
-import org.lealone.db.Constants;
-import org.lealone.db.value.Value;
+import com.lealone.db.Constants;
+import com.lealone.db.value.Value;
 
 /**
  * A simple row that contains data for only one column.
diff --git a/lealone-db/src/main/java/org/lealone/db/result/SortOrder.java b/lealone-db/src/main/java/com/lealone/db/result/SortOrder.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/result/SortOrder.java
rename to lealone-db/src/main/java/com/lealone/db/result/SortOrder.java
index 640ff4b76..4daeb9375 100644
--- a/lealone-db/src/main/java/org/lealone/db/result/SortOrder.java
+++ b/lealone-db/src/main/java/com/lealone/db/result/SortOrder.java
@@ -3,22 +3,22 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.result;
+package com.lealone.db.result;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Database;
-import org.lealone.db.SysProperties;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IExpression;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Database;
+import com.lealone.db.SysProperties;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IExpression;
 
 /**
  * A sort order represents an ORDER BY clause in a query.
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/Constant.java b/lealone-db/src/main/java/com/lealone/db/schema/Constant.java
similarity index 88%
rename from lealone-db/src/main/java/org/lealone/db/schema/Constant.java
rename to lealone-db/src/main/java/com/lealone/db/schema/Constant.java
index 0ac7f0b57..56689c278 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/Constant.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/Constant.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
-import org.lealone.db.DbObjectType;
-import org.lealone.db.value.Value;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.value.Value;
 
 /**
  * A user-defined constant as created by the SQL statement
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/FunctionAlias.java b/lealone-db/src/main/java/com/lealone/db/schema/FunctionAlias.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/schema/FunctionAlias.java
rename to lealone-db/src/main/java/com/lealone/db/schema/FunctionAlias.java
index 8f1f067e0..a461532f1 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/FunctionAlias.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/FunctionAlias.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
@@ -16,21 +16,21 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.SourceCompiler;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.SourceCompiler;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IExpression;
 
 /**
  * Represents a user-defined function, or alias.
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/Schema.java b/lealone-db/src/main/java/com/lealone/db/schema/Schema.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/schema/Schema.java
rename to lealone-db/src/main/java/com/lealone/db/schema/Schema.java
index 16e3d2fc6..8202be3be 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/Schema.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/Schema.java
@@ -3,36 +3,36 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectBase;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.PluginManager;
-import org.lealone.db.SysProperties;
-import org.lealone.db.TransactionalDbObjects;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.User;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.index.Index;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.CreateTableData;
-import org.lealone.db.table.StandardTable;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableFactory;
-import org.lealone.storage.StorageEngine;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectBase;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.PluginManager;
+import com.lealone.db.SysProperties;
+import com.lealone.db.TransactionalDbObjects;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.User;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.index.Index;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.CreateTableData;
+import com.lealone.db.table.StandardTable;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableFactory;
+import com.lealone.storage.StorageEngine;
 
 /**
  * A schema as created by the SQL statement
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/SchemaObject.java b/lealone-db/src/main/java/com/lealone/db/schema/SchemaObject.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/schema/SchemaObject.java
rename to lealone-db/src/main/java/com/lealone/db/schema/SchemaObject.java
index 425a5e4ff..67d1bdccb 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/SchemaObject.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/SchemaObject.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
-import org.lealone.db.DbObject;
+import com.lealone.db.DbObject;
 
 /**
  * Any database object that is stored in a schema.
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/SchemaObjectBase.java b/lealone-db/src/main/java/com/lealone/db/schema/SchemaObjectBase.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/schema/SchemaObjectBase.java
rename to lealone-db/src/main/java/com/lealone/db/schema/SchemaObjectBase.java
index 263df1365..5e3792e87 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/SchemaObjectBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/SchemaObjectBase.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
-import org.lealone.db.DbObjectBase;
+import com.lealone.db.DbObjectBase;
 
 /**
  * The base class for classes implementing SchemaObject.
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/Sequence.java b/lealone-db/src/main/java/com/lealone/db/schema/Sequence.java
similarity index 97%
rename from lealone-db/src/main/java/org/lealone/db/schema/Sequence.java
rename to lealone-db/src/main/java/com/lealone/db/schema/Sequence.java
index dca5ff520..ecb37b0cb 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/Sequence.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/Sequence.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
 import java.math.BigInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.transaction.Transaction;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.transaction.Transaction;
 
 /**
  * A sequence is created using the statement
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/TriggerObject.java b/lealone-db/src/main/java/com/lealone/db/schema/TriggerObject.java
similarity index 95%
rename from lealone-db/src/main/java/org/lealone/db/schema/TriggerObject.java
rename to lealone-db/src/main/java/com/lealone/db/schema/TriggerObject.java
index 4af59e320..5ff5f2503 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/TriggerObject.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/TriggerObject.java
@@ -3,27 +3,27 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.util.SourceCompiler;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.util.SourceCompiler;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
 
 /**
  * A trigger is created using the statement
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/UserAggregate.java b/lealone-db/src/main/java/com/lealone/db/schema/UserAggregate.java
similarity index 88%
rename from lealone-db/src/main/java/org/lealone/db/schema/UserAggregate.java
rename to lealone-db/src/main/java/com/lealone/db/schema/UserAggregate.java
index 8d711224f..41a51f966 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/UserAggregate.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/UserAggregate.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.Aggregate;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.Aggregate;
 
 /**
  * Represents a user-defined aggregate function.
diff --git a/lealone-db/src/main/java/org/lealone/db/schema/UserDataType.java b/lealone-db/src/main/java/com/lealone/db/schema/UserDataType.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/schema/UserDataType.java
rename to lealone-db/src/main/java/com/lealone/db/schema/UserDataType.java
index 3f44c97db..048e74344 100644
--- a/lealone-db/src/main/java/org/lealone/db/schema/UserDataType.java
+++ b/lealone-db/src/main/java/com/lealone/db/schema/UserDataType.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.schema;
+package com.lealone.db.schema;
 
-import org.lealone.db.DbObjectType;
-import org.lealone.db.table.Column;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.table.Column;
 
 /**
  * Represents a domain (user-defined data type).
diff --git a/lealone-db/src/main/java/org/lealone/db/service/JavaServiceExecutor.java b/lealone-db/src/main/java/com/lealone/db/service/JavaServiceExecutor.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/service/JavaServiceExecutor.java
rename to lealone-db/src/main/java/com/lealone/db/service/JavaServiceExecutor.java
index 37d028507..c15ee7357 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/JavaServiceExecutor.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/JavaServiceExecutor.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -12,13 +12,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CamelCaseHelper;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CamelCaseHelper;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
 
 public class JavaServiceExecutor extends ServiceExecutorBase {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/JavaServiceExecutorFactory.java b/lealone-db/src/main/java/com/lealone/db/service/JavaServiceExecutorFactory.java
similarity index 92%
rename from lealone-db/src/main/java/org/lealone/db/service/JavaServiceExecutorFactory.java
rename to lealone-db/src/main/java/com/lealone/db/service/JavaServiceExecutorFactory.java
index eccea4bc9..25f931ffa 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/JavaServiceExecutorFactory.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/JavaServiceExecutorFactory.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 public class JavaServiceExecutorFactory extends ServiceExecutorFactoryBase {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/JsonArrayGetter.java b/lealone-db/src/main/java/com/lealone/db/service/JsonArrayGetter.java
similarity index 74%
rename from lealone-db/src/main/java/org/lealone/db/service/JsonArrayGetter.java
rename to lealone-db/src/main/java/com/lealone/db/service/JsonArrayGetter.java
index 0ac54ac54..4d8b0e487 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/JsonArrayGetter.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/JsonArrayGetter.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
 
 public interface JsonArrayGetter {
 
     public static JsonArrayGetter create(String json) {
         try {
-            String className = "org.lealone.plugins.orm.json.JsonArray$Getter";
+            String className = "com.lealone.plugins.orm.json.JsonArray$Getter";
             JsonArrayGetter getter = Utils.newInstance(className);
             getter.init(json);
             return getter;
diff --git a/lealone-db/src/main/java/org/lealone/db/service/Service.java b/lealone-db/src/main/java/com/lealone/db/service/Service.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/service/Service.java
rename to lealone-db/src/main/java/com/lealone/db/service/Service.java
index 90d946150..1b7032d56 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/Service.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/Service.java
@@ -3,24 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 import java.util.List;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObjectBase;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.SourceCompiler;
-import org.lealone.db.value.Value;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObjectBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.SourceCompiler;
+import com.lealone.db.value.Value;
 
 public class Service extends SchemaObjectBase {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutor.java b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutor.java
similarity index 94%
rename from lealone-db/src/main/java/org/lealone/db/service/ServiceExecutor.java
rename to lealone-db/src/main/java/com/lealone/db/service/ServiceExecutor.java
index b047ee9c8..977333731 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutor.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutor.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 import java.math.BigDecimal;
 import java.sql.Array;
@@ -19,8 +19,8 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
 
 public interface ServiceExecutor {
 
@@ -95,17 +95,17 @@ public default BigDecimal toBigDecimal(String key, Map methodArg
 
     public default Blob toBlob(String key, Map methodArgs) {
         String v = toString(key, methodArgs);
-        return v == null ? null : new org.lealone.db.value.ReadonlyBlob(v);
+        return v == null ? null : new com.lealone.db.value.ReadonlyBlob(v);
     }
 
     public default Clob toClob(String key, Map methodArgs) {
         String v = toString(key, methodArgs);
-        return v == null ? null : new org.lealone.db.value.ReadonlyClob(v);
+        return v == null ? null : new com.lealone.db.value.ReadonlyClob(v);
     }
 
     public default Array toArray(String key, Map methodArgs) {
         String v = toString(key, methodArgs);
-        return v == null ? null : new org.lealone.db.value.ReadonlyArray(v);
+        return v == null ? null : new com.lealone.db.value.ReadonlyArray(v);
     }
 
     public default UUID toUUID(String key, Map methodArgs) {
diff --git a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorBase.java b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorBase.java
similarity index 97%
rename from lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorBase.java
rename to lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorBase.java
index 242ec1347..6f7d39f1a 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorBase.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 import java.util.List;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
 
 public abstract class ServiceExecutorBase implements ServiceExecutor {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorFactory.java b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorFactory.java
similarity index 85%
rename from lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorFactory.java
rename to lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorFactory.java
index de06704ab..420f71eac 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorFactory.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorFactory.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
-import org.lealone.db.Plugin;
+import com.lealone.db.Plugin;
 
 public interface ServiceExecutorFactory extends Plugin {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorFactoryBase.java b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorFactoryBase.java
similarity index 81%
rename from lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorFactoryBase.java
rename to lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorFactoryBase.java
index 23f7b52df..a03ed72a4 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/ServiceExecutorFactoryBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/ServiceExecutorFactoryBase.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class ServiceExecutorFactoryBase extends PluginBase implements ServiceExecutorFactory {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/ServiceMethod.java b/lealone-db/src/main/java/com/lealone/db/service/ServiceMethod.java
similarity index 92%
rename from lealone-db/src/main/java/org/lealone/db/service/ServiceMethod.java
rename to lealone-db/src/main/java/com/lealone/db/service/ServiceMethod.java
index 7f72908fc..6f0bec15a 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/ServiceMethod.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/ServiceMethod.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 import java.util.List;
 
-import org.lealone.db.table.Column;
+import com.lealone.db.table.Column;
 
 public class ServiceMethod {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/service/ServiceSetting.java b/lealone-db/src/main/java/com/lealone/db/service/ServiceSetting.java
similarity index 88%
rename from lealone-db/src/main/java/org/lealone/db/service/ServiceSetting.java
rename to lealone-db/src/main/java/com/lealone/db/service/ServiceSetting.java
index b19e50a28..01d0ba3c0 100644
--- a/lealone-db/src/main/java/org/lealone/db/service/ServiceSetting.java
+++ b/lealone-db/src/main/java/com/lealone/db/service/ServiceSetting.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.service;
+package com.lealone.db.service;
 
 public enum ServiceSetting {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/session/ServerSession.java b/lealone-db/src/main/java/com/lealone/db/session/ServerSession.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/session/ServerSession.java
rename to lealone-db/src/main/java/com/lealone/db/session/ServerSession.java
index 2786c3252..93ee58cb8 100644
--- a/lealone-db/src/main/java/org/lealone/db/session/ServerSession.java
+++ b/lealone-db/src/main/java/com/lealone/db/session/ServerSession.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
 import java.io.InputStream;
 import java.sql.Connection;
@@ -17,56 +17,56 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.common.util.ExpiringMap;
-import org.lealone.common.util.SmallLRUCache;
-import org.lealone.db.Command;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.Database;
-import org.lealone.db.DbSetting;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.ManualCloseable;
-import org.lealone.db.Procedure;
-import org.lealone.db.RunMode;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.async.Future;
-import org.lealone.db.auth.User;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.index.Index;
-import org.lealone.db.lock.Lock;
-import org.lealone.db.result.Result;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerThread;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLob;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.net.NetNode;
-import org.lealone.server.protocol.AckPacket;
-import org.lealone.server.protocol.AckPacketHandler;
-import org.lealone.server.protocol.Packet;
-import org.lealone.sql.ParsedSQLStatement;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
-import org.lealone.sql.SQLCommand;
-import org.lealone.sql.SQLEngine;
-import org.lealone.sql.SQLParser;
-import org.lealone.sql.SQLStatement;
-import org.lealone.storage.lob.LobStorage;
-import org.lealone.storage.page.IPage;
-import org.lealone.transaction.Transaction;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.common.util.ExpiringMap;
+import com.lealone.common.util.SmallLRUCache;
+import com.lealone.db.Command;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.Database;
+import com.lealone.db.DbSetting;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.ManualCloseable;
+import com.lealone.db.Procedure;
+import com.lealone.db.RunMode;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.async.Future;
+import com.lealone.db.auth.User;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.index.Index;
+import com.lealone.db.lock.Lock;
+import com.lealone.db.result.Result;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerThread;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLob;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.net.NetNode;
+import com.lealone.server.protocol.AckPacket;
+import com.lealone.server.protocol.AckPacketHandler;
+import com.lealone.server.protocol.Packet;
+import com.lealone.sql.ParsedSQLStatement;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
+import com.lealone.sql.SQLCommand;
+import com.lealone.sql.SQLEngine;
+import com.lealone.sql.SQLParser;
+import com.lealone.sql.SQLStatement;
+import com.lealone.storage.lob.LobStorage;
+import com.lealone.storage.page.IPage;
+import com.lealone.transaction.Transaction;
 
 /**
  * A session represents an embedded database connection. When using the server
diff --git a/lealone-db/src/main/java/org/lealone/db/session/ServerSessionFactory.java b/lealone-db/src/main/java/com/lealone/db/session/ServerSessionFactory.java
similarity index 86%
rename from lealone-db/src/main/java/org/lealone/db/session/ServerSessionFactory.java
rename to lealone-db/src/main/java/com/lealone/db/session/ServerSessionFactory.java
index c51b06c2f..4bf65d50c 100644
--- a/lealone-db/src/main/java/org/lealone/db/session/ServerSessionFactory.java
+++ b/lealone-db/src/main/java/com/lealone/db/session/ServerSessionFactory.java
@@ -3,23 +3,23 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.session;
+package com.lealone.db.session;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Database;
-import org.lealone.db.DbSetting;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.Mode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.auth.User;
-import org.lealone.db.scheduler.EmbeddedScheduler;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerLock;
-import org.lealone.db.scheduler.SchedulerThread;
-import org.lealone.net.NetNode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Database;
+import com.lealone.db.DbSetting;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.Mode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.auth.User;
+import com.lealone.db.scheduler.EmbeddedScheduler;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerLock;
+import com.lealone.db.scheduler.SchedulerThread;
+import com.lealone.net.NetNode;
 
 public class ServerSessionFactory extends SessionFactoryBase {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/stat/QueryStatisticsData.java b/lealone-db/src/main/java/com/lealone/db/stat/QueryStatisticsData.java
similarity index 99%
rename from lealone-db/src/main/java/org/lealone/db/stat/QueryStatisticsData.java
rename to lealone-db/src/main/java/com/lealone/db/stat/QueryStatisticsData.java
index 85ef0d098..c35f9f3f7 100644
--- a/lealone-db/src/main/java/org/lealone/db/stat/QueryStatisticsData.java
+++ b/lealone-db/src/main/java/com/lealone/db/stat/QueryStatisticsData.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.stat;
+package com.lealone.db.stat;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/lealone-db/src/main/java/org/lealone/db/table/Column.java b/lealone-db/src/main/java/com/lealone/db/table/Column.java
similarity index 95%
rename from lealone-db/src/main/java/org/lealone/db/table/Column.java
rename to lealone-db/src/main/java/com/lealone/db/table/Column.java
index ec19a6d8b..2569cd4ac 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/Column.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/Column.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.sql.Date;
 import java.sql.ResultSetMetaData;
@@ -11,35 +11,35 @@
 import java.util.List;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.DbObject;
-import org.lealone.db.Mode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueEnum;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueList;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueMap;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueSet;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.SQLEngine;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.DbObject;
+import com.lealone.db.Mode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueEnum;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueList;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueMap;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueSet;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.SQLEngine;
 
 /**
  * This class represents a column in a table.
@@ -596,7 +596,7 @@ public IExpression getCheckConstraint(ServerSession session, String asColumnName
         if (checkConstraint == null) {
             return null;
         }
-        org.lealone.sql.SQLParser parser = session.createParser();
+        com.lealone.sql.SQLParser parser = session.createParser();
         String sql;
         synchronized (this) {
             String oldName = name;
diff --git a/lealone-db/src/main/java/org/lealone/db/table/CreateTableData.java b/lealone-db/src/main/java/com/lealone/db/table/CreateTableData.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/table/CreateTableData.java
rename to lealone-db/src/main/java/com/lealone/db/table/CreateTableData.java
index 3fec8da1a..8b132c6d1 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/CreateTableData.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/CreateTableData.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.ArrayList;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
 
 /**
  * The data required to create a table.
diff --git a/lealone-db/src/main/java/org/lealone/db/table/DummyTable.java b/lealone-db/src/main/java/com/lealone/db/table/DummyTable.java
similarity index 88%
rename from lealone-db/src/main/java/org/lealone/db/table/DummyTable.java
rename to lealone-db/src/main/java/com/lealone/db/table/DummyTable.java
index 25433db2c..0a2c7a7e5 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/DummyTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/DummyTable.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
-import org.lealone.db.index.Index;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.index.Index;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
 
 //只用于创建服务时的void类型解析
 public class DummyTable extends Table {
diff --git a/lealone-db/src/main/java/org/lealone/db/table/InfoMetaTable.java b/lealone-db/src/main/java/com/lealone/db/table/InfoMetaTable.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/table/InfoMetaTable.java
rename to lealone-db/src/main/java/com/lealone/db/table/InfoMetaTable.java
index 5a6fe891f..a25ea46a7 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/InfoMetaTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/InfoMetaTable.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.io.Reader;
 import java.sql.DatabaseMetaData;
@@ -18,55 +18,55 @@
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Command;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginManager;
-import org.lealone.db.PluginObject;
-import org.lealone.db.SysProperties;
-import org.lealone.db.auth.Right;
-import org.lealone.db.auth.Role;
-import org.lealone.db.auth.User;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.constraint.ConstraintCheck;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.constraint.ConstraintUnique;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.lock.Lock;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.schema.Constant;
-import org.lealone.db.schema.FunctionAlias;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObject;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.schema.TriggerObject;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.schema.UserDataType;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.Csv;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueStringIgnoreCase;
-import org.lealone.server.ProtocolServerEngine;
-import org.lealone.sql.SQLEngine;
-import org.lealone.storage.StorageEngine;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Command;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginManager;
+import com.lealone.db.PluginObject;
+import com.lealone.db.SysProperties;
+import com.lealone.db.auth.Right;
+import com.lealone.db.auth.Role;
+import com.lealone.db.auth.User;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.constraint.ConstraintCheck;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.constraint.ConstraintUnique;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.lock.Lock;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.schema.Constant;
+import com.lealone.db.schema.FunctionAlias;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObject;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.schema.TriggerObject;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.schema.UserDataType;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.Csv;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueStringIgnoreCase;
+import com.lealone.server.ProtocolServerEngine;
+import com.lealone.sql.SQLEngine;
+import com.lealone.storage.StorageEngine;
+import com.lealone.transaction.TransactionEngine;
 
 /**
  * This class is responsible to build the database information meta data pseudo tables.
diff --git a/lealone-db/src/main/java/org/lealone/db/table/MetaTable.java b/lealone-db/src/main/java/com/lealone/db/table/MetaTable.java
similarity index 89%
rename from lealone-db/src/main/java/org/lealone/db/table/MetaTable.java
rename to lealone-db/src/main/java/com/lealone/db/table/MetaTable.java
index 391a9461b..d861ae0a2 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/MetaTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/MetaTable.java
@@ -3,23 +3,23 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.MetaIndex;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.MetaIndex;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
 
 /**
  * This class is responsible to build the database meta data pseudo tables.
diff --git a/lealone-db/src/main/java/org/lealone/db/table/PerfMetaTable.java b/lealone-db/src/main/java/com/lealone/db/table/PerfMetaTable.java
similarity index 91%
rename from lealone-db/src/main/java/org/lealone/db/table/PerfMetaTable.java
rename to lealone-db/src/main/java/com/lealone/db/table/PerfMetaTable.java
index ceeb08a56..4f09943f5 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/PerfMetaTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/PerfMetaTable.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.stat.QueryStatisticsData;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.stat.QueryStatisticsData;
 
 /**
  * This class is responsible to build the database performance meta data pseudo tables.
diff --git a/lealone-db/src/main/java/org/lealone/db/table/RangeTable.java b/lealone-db/src/main/java/com/lealone/db/table/RangeTable.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/table/RangeTable.java
rename to lealone-db/src/main/java/com/lealone/db/table/RangeTable.java
index 32a53454f..c530e6cc1 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/RangeTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/RangeTable.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.RangeIndex;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.IExpression;
+package com.lealone.db.table;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.RangeIndex;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.IExpression;
 
 /**
  * The table SYSTEM_RANGE is a virtual table that generates incrementing numbers
diff --git a/lealone-db/src/main/java/org/lealone/db/table/StandardTable.java b/lealone-db/src/main/java/com/lealone/db/table/StandardTable.java
similarity index 92%
rename from lealone-db/src/main/java/org/lealone/db/table/StandardTable.java
rename to lealone-db/src/main/java/com/lealone/db/table/StandardTable.java
index 21b9b3350..230b58fb2 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/StandardTable.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/StandardTable.java
@@ -3,52 +3,52 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.MapUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.RunMode;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.async.Future;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexRebuilder;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.index.hash.NonUniqueHashIndex;
-import org.lealone.db.index.hash.UniqueHashIndex;
-import org.lealone.db.index.standard.StandardDelegateIndex;
-import org.lealone.db.index.standard.StandardPrimaryIndex;
-import org.lealone.db.index.standard.StandardSecondaryIndex;
-import org.lealone.db.index.standard.VersionedValue;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.schema.SchemaObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column.EnumColumn;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.storage.StorageEngine;
-import org.lealone.storage.StorageSetting;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.MapUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.RunMode;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.async.Future;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexRebuilder;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.index.hash.NonUniqueHashIndex;
+import com.lealone.db.index.hash.UniqueHashIndex;
+import com.lealone.db.index.standard.StandardDelegateIndex;
+import com.lealone.db.index.standard.StandardPrimaryIndex;
+import com.lealone.db.index.standard.StandardSecondaryIndex;
+import com.lealone.db.index.standard.VersionedValue;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.schema.SchemaObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column.EnumColumn;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.storage.StorageEngine;
+import com.lealone.storage.StorageSetting;
 
 /**
  * @author H2 Group
diff --git a/lealone-db/src/main/java/org/lealone/db/table/Table.java b/lealone-db/src/main/java/com/lealone/db/table/Table.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/table/Table.java
rename to lealone-db/src/main/java/com/lealone/db/table/Table.java
index 08863f631..df84b7f3f 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/Table.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/Table.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,34 +12,34 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.Future;
-import org.lealone.db.auth.Right;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SimpleRow;
-import org.lealone.db.result.SimpleRowValue;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObjectBase;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.schema.TriggerObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.Future;
+import com.lealone.db.auth.Right;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SimpleRow;
+import com.lealone.db.result.SimpleRowValue;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObjectBase;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.schema.TriggerObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IExpression;
 
 /**
  * This is the base class for most tables.
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableAlterHistory.java b/lealone-db/src/main/java/com/lealone/db/table/TableAlterHistory.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/table/TableAlterHistory.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableAlterHistory.java
index fc5065b47..7b11e732f 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableAlterHistory.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableAlterHistory.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -12,9 +12,9 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.RunMode;
-import org.lealone.storage.StorageSetting;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.RunMode;
+import com.lealone.storage.StorageSetting;
 
 public class TableAlterHistory {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableAlterHistoryRecord.java b/lealone-db/src/main/java/com/lealone/db/table/TableAlterHistoryRecord.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/table/TableAlterHistoryRecord.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableAlterHistoryRecord.java
index c03e24e08..62b17a843 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableAlterHistoryRecord.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableAlterHistoryRecord.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.SQLStatement;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.SQLStatement;
 
 public class TableAlterHistoryRecord {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableAnalyzer.java b/lealone-db/src/main/java/com/lealone/db/table/TableAnalyzer.java
similarity index 90%
rename from lealone-db/src/main/java/org/lealone/db/table/TableAnalyzer.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableAnalyzer.java
index 80ccac431..49bc41725 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableAnalyzer.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableAnalyzer.java
@@ -3,21 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Database;
-import org.lealone.db.auth.Right;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Database;
+import com.lealone.db.auth.Right;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.PreparedSQLStatement;
 
 public class TableAnalyzer {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableCodeGenerator.java b/lealone-db/src/main/java/com/lealone/db/table/TableCodeGenerator.java
similarity index 71%
rename from lealone-db/src/main/java/org/lealone/db/table/TableCodeGenerator.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableCodeGenerator.java
index 2eba24bd0..a72424e2d 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableCodeGenerator.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableCodeGenerator.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.Plugin;
+import com.lealone.db.session.ServerSession;
 
 public interface TableCodeGenerator extends Plugin {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableCodeGeneratorBase.java b/lealone-db/src/main/java/com/lealone/db/table/TableCodeGeneratorBase.java
similarity index 81%
rename from lealone-db/src/main/java/org/lealone/db/table/TableCodeGeneratorBase.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableCodeGeneratorBase.java
index d038c9fdb..62e8345ad 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableCodeGeneratorBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableCodeGeneratorBase.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class TableCodeGeneratorBase extends PluginBase implements TableCodeGenerator {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableDataHandler.java b/lealone-db/src/main/java/com/lealone/db/table/TableDataHandler.java
similarity index 81%
rename from lealone-db/src/main/java/org/lealone/db/table/TableDataHandler.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableDataHandler.java
index 47e155d0a..fa2935da2 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableDataHandler.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableDataHandler.java
@@ -3,19 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.io.File;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.TempFileDeleter;
-import org.lealone.db.DataHandler;
-import org.lealone.db.Database;
-import org.lealone.storage.Storage;
-import org.lealone.storage.StorageBuilder;
-import org.lealone.storage.StorageEngine;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.lob.LobStorage;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.TempFileDeleter;
+import com.lealone.db.DataHandler;
+import com.lealone.db.Database;
+import com.lealone.storage.Storage;
+import com.lealone.storage.StorageBuilder;
+import com.lealone.storage.StorageEngine;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.lob.LobStorage;
 
 public class TableDataHandler implements DataHandler {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableFactory.java b/lealone-db/src/main/java/com/lealone/db/table/TableFactory.java
similarity index 87%
rename from lealone-db/src/main/java/org/lealone/db/table/TableFactory.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableFactory.java
index 90d7d6c9f..c0c9252e9 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableFactory.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableFactory.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 public interface TableFactory {
     Table createTable(CreateTableData data);
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableSetting.java b/lealone-db/src/main/java/com/lealone/db/table/TableSetting.java
similarity index 86%
rename from lealone-db/src/main/java/org/lealone/db/table/TableSetting.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableSetting.java
index 750d21d9f..c523c0305 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableSetting.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableSetting.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 public enum TableSetting {
 
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableType.java b/lealone-db/src/main/java/com/lealone/db/table/TableType.java
similarity index 89%
rename from lealone-db/src/main/java/org/lealone/db/table/TableType.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableType.java
index fc98182f7..4e1abbe93 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableType.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableType.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 public enum TableType {
     STANDARD_TABLE,
diff --git a/lealone-db/src/main/java/org/lealone/db/table/TableView.java b/lealone-db/src/main/java/com/lealone/db/table/TableView.java
similarity index 93%
rename from lealone-db/src/main/java/org/lealone/db/table/TableView.java
rename to lealone-db/src/main/java/com/lealone/db/table/TableView.java
index 60f65eb76..1b4fc0925 100644
--- a/lealone-db/src/main/java/org/lealone/db/table/TableView.java
+++ b/lealone-db/src/main/java/com/lealone/db/table/TableView.java
@@ -3,34 +3,34 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.table;
+package com.lealone.db.table;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.SmallLRUCache;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.User;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.ViewIndex;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.IntArray;
-import org.lealone.db.util.SynchronizedVerifier;
-import org.lealone.db.value.Value;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.IQuery;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.SmallLRUCache;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.User;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.ViewIndex;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.IntArray;
+import com.lealone.db.util.SynchronizedVerifier;
+import com.lealone.db.value.Value;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.IQuery;
+import com.lealone.sql.PreparedSQLStatement;
 
 /**
  * A view is a virtual table that is defined by a query.
diff --git a/lealone-db/src/main/java/org/lealone/db/util/Csv.java b/lealone-db/src/main/java/com/lealone/db/util/Csv.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/util/Csv.java
rename to lealone-db/src/main/java/com/lealone/db/util/Csv.java
index 5e8155333..787a3f9ed 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/Csv.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/Csv.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -26,15 +26,15 @@
 import java.sql.Types;
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.JdbcUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SimpleResultSet;
-import org.lealone.db.result.SimpleRowSource;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.JdbcUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SimpleResultSet;
+import com.lealone.db.result.SimpleRowSource;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * A facility to read from and write to CSV (comma separated values) files. When
diff --git a/lealone-db/src/main/java/org/lealone/db/util/HashBase.java b/lealone-db/src/main/java/com/lealone/db/util/HashBase.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/util/HashBase.java
rename to lealone-db/src/main/java/com/lealone/db/util/HashBase.java
index d8659f3ac..70a899e87 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/HashBase.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/HashBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
 /**
  * The base for other hash classes.
diff --git a/lealone-db/src/main/java/org/lealone/db/util/IntArray.java b/lealone-db/src/main/java/com/lealone/db/util/IntArray.java
similarity index 97%
rename from lealone-db/src/main/java/org/lealone/db/util/IntArray.java
rename to lealone-db/src/main/java/com/lealone/db/util/IntArray.java
index 21f85c301..ff178efd9 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/IntArray.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/IntArray.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.SysProperties;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.SysProperties;
 
 /**
  * An array with integer element.
diff --git a/lealone-db/src/main/java/org/lealone/db/util/IntIntHashMap.java b/lealone-db/src/main/java/com/lealone/db/util/IntIntHashMap.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/util/IntIntHashMap.java
rename to lealone-db/src/main/java/com/lealone/db/util/IntIntHashMap.java
index 92463388b..f392a1afa 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/IntIntHashMap.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/IntIntHashMap.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
-import org.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.DbException;
 
 /**
  * A hash map with int key and int values. There is a restriction: the
diff --git a/lealone-db/src/main/java/org/lealone/db/util/SourceCompiler.java b/lealone-db/src/main/java/com/lealone/db/util/SourceCompiler.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/util/SourceCompiler.java
rename to lealone-db/src/main/java/com/lealone/db/util/SourceCompiler.java
index 838240f13..182c3aa3e 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/SourceCompiler.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/SourceCompiler.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,14 +32,15 @@
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.Utils;
+
 import javax.tools.SimpleJavaFileObject;
 import javax.tools.ToolProvider;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.Utils;
-
 /**
  * This class allows to convert source code to a class. It uses one class loader per class.
  * 
diff --git a/lealone-db/src/main/java/org/lealone/db/util/SynchronizedVerifier.java b/lealone-db/src/main/java/com/lealone/db/util/SynchronizedVerifier.java
similarity index 98%
rename from lealone-db/src/main/java/org/lealone/db/util/SynchronizedVerifier.java
rename to lealone-db/src/main/java/com/lealone/db/util/SynchronizedVerifier.java
index 318f350c0..7565d0752 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/SynchronizedVerifier.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/SynchronizedVerifier.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/lealone-db/src/main/java/org/lealone/db/util/ValueHashMap.java b/lealone-db/src/main/java/com/lealone/db/util/ValueHashMap.java
similarity index 96%
rename from lealone-db/src/main/java/org/lealone/db/util/ValueHashMap.java
rename to lealone-db/src/main/java/com/lealone/db/util/ValueHashMap.java
index 63a6be3ad..5a6dede57 100644
--- a/lealone-db/src/main/java/org/lealone/db/util/ValueHashMap.java
+++ b/lealone-db/src/main/java/com/lealone/db/util/ValueHashMap.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.util;
+package com.lealone.db.util;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
 
 /**
  * This hash map supports keys of type Value.
diff --git a/lealone-db/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory b/lealone-db/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory
new file mode 100644
index 000000000..7c11bf5a4
--- /dev/null
+++ b/lealone-db/src/main/resources/META-INF/services/com.lealone.db.session.SessionFactory
@@ -0,0 +1 @@
+com.lealone.db.session.ServerSessionFactory
\ No newline at end of file
diff --git a/lealone-db/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory b/lealone-db/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory
deleted file mode 100644
index 6e8534b58..000000000
--- a/lealone-db/src/main/resources/META-INF/services/org.lealone.db.session.SessionFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.db.session.ServerSessionFactory
\ No newline at end of file
diff --git a/lealone-db/src/main/resources/org/lealone/common/resources/help.csv b/lealone-db/src/main/resources/com/lealone/common/resources/help.csv
similarity index 99%
rename from lealone-db/src/main/resources/org/lealone/common/resources/help.csv
rename to lealone-db/src/main/resources/com/lealone/common/resources/help.csv
index b0dd55101..90380ea27 100644
--- a/lealone-db/src/main/resources/org/lealone/common/resources/help.csv
+++ b/lealone-db/src/main/resources/com/lealone/common/resources/help.csv
@@ -452,7 +452,7 @@ CREATE AGGREGATE [ IF NOT EXISTS ] newAggregateName FOR className
 ","
 Creates a new user-defined aggregate function. The method name must be the full
 qualified class name. The class must implement the interface
-""org.lealone.db.api.Aggregate"".
+""com.lealone.db.api.Aggregate"".
 
 Admin rights are required to execute this command.
 
@@ -620,7 +620,7 @@ Indexes of temporary tables are kept fully in main memory,
 unless the temporary table is created using CREATE CACHED TABLE.
 
 The ENGINE option is only required when custom table implementations are used.
-The table engine class must implement the interface ""org.lealone.db.table.TableFactory"".
+The table engine class must implement the interface ""com.lealone.db.table.TableFactory"".
 Any table engine parameters are passed down in the tableEngineParams field of the CreateTableData object.
 
 Tables with the NOT PERSISTENT modifier are kept fully in memory, and all
@@ -641,7 +641,7 @@ CREATE TRIGGER [ IF NOT EXISTS ] newTriggerName { BEFORE | AFTER | INSTEAD OF }
 [ QUEUE int ] [ NOWAIT ] CALL triggeredClassName
 ","
 Creates a new trigger.
-The trigger class must be public and implement ""org.lealone.db.api.Trigger"".
+The trigger class must be public and implement ""com.lealone.db.api.Trigger"".
 Inner classes are not supported.
 The class must be available in the classpath of the database engine
 (when using the server mode, it must be in the classpath of the server).
diff --git a/lealone-dist/bin/lealone.bat b/lealone-dist/bin/lealone.bat
index 86a8eddf3..887e8479a 100644
--- a/lealone-dist/bin/lealone.bat
+++ b/lealone-dist/bin/lealone.bat
@@ -38,7 +38,7 @@ if "%str%"=="" (
 
 :exec
 set CLASSPATH="%LEALONE_HOME%\conf;%LEALONE_HOME%\lib\*"
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp %CLASSPATH% org.lealone.main.Lealone %*
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp %CLASSPATH% com.lealone.main.Lealone %*
 goto finally
 
 :err
diff --git a/lealone-dist/bin/lealone.sh b/lealone-dist/bin/lealone.sh
index e39fb4a15..90cd8c6ca 100644
--- a/lealone-dist/bin/lealone.sh
+++ b/lealone-dist/bin/lealone.sh
@@ -33,4 +33,4 @@ fi
 
 CLASSPATH=$LEALONE_HOME/conf:$LEALONE_HOME/lib/*
 
-"$JAVA_HOME/bin/java" $JAVA_OPTS -cp $CLASSPATH org.lealone.main.Lealone "$@"
+"$JAVA_HOME/bin/java" $JAVA_OPTS -cp $CLASSPATH com.lealone.main.Lealone "$@"
diff --git a/lealone-dist/pom.xml b/lealone-dist/pom.xml
index 226ca9bea..35680e32e 100644
--- a/lealone-dist/pom.xml
+++ b/lealone-dist/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -36,7 +36,7 @@
                                 
                                     
-                                        org.lealone.main.Lealone
+                                        com.lealone.main.Lealone
                                          
                                         true
                                         Lealone Database Group
@@ -61,7 +61,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-main
             ${project.version}
         
diff --git a/lealone-main/pom.xml b/lealone-main/pom.xml
index a038f40b0..54a2142e4 100644
--- a/lealone-main/pom.xml
+++ b/lealone-main/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -20,42 +20,42 @@
     
     
         
-            org.lealone
+            com.lealone
             lealone-client
             ${project.version}
         
         
-            org.lealone
+            com.lealone
             lealone-server
             ${project.version}
         
         
-            org.lealone
+            com.lealone
             lealone-aote
             ${project.version}
         
         
-            org.lealone
+            com.lealone
             lealone-aose
             ${project.version}
         
         
-            org.lealone
+            com.lealone
             lealone-sql
             ${project.version}
         
         
-            org.lealone.plugins
+            com.lealone.plugins
             lealone-mongo
             ${project.version}
         
         
-            org.lealone.plugins
+            com.lealone.plugins
             lealone-mysql
             ${project.version}
         
         
-            org.lealone.plugins
+            com.lealone.plugins
             lealone-postgresql
             ${project.version}
         
diff --git a/lealone-main/src/main/java/org/lealone/main/Lealone.java b/lealone-main/src/main/java/com/lealone/main/Lealone.java
similarity index 92%
rename from lealone-main/src/main/java/org/lealone/main/Lealone.java
rename to lealone-main/src/main/java/com/lealone/main/Lealone.java
index d250b85df..f66254c0f 100644
--- a/lealone-main/src/main/java/org/lealone/main/Lealone.java
+++ b/lealone-main/src/main/java/com/lealone/main/Lealone.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.main;
+package com.lealone.main;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,34 +14,34 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import org.lealone.common.exceptions.ConfigException;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.ShutdownHookUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.PluggableEngine;
-import org.lealone.db.PluginManager;
-import org.lealone.db.SysProperties;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerFactory;
-import org.lealone.main.config.Config;
-import org.lealone.main.config.Config.PluggableEngineDef;
-import org.lealone.main.config.ConfigLoader;
-import org.lealone.main.config.YamlConfigLoader;
-import org.lealone.plugins.mongo.server.MongoServerEngine;
-import org.lealone.plugins.mysql.server.MySQLServerEngine;
-import org.lealone.plugins.postgresql.server.PgServerEngine;
-import org.lealone.server.ProtocolServer;
-import org.lealone.server.ProtocolServerEngine;
-import org.lealone.server.TcpServerEngine;
-import org.lealone.server.scheduler.GlobalScheduler;
-import org.lealone.sql.SQLEngine;
-import org.lealone.storage.StorageEngine;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.common.exceptions.ConfigException;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.ShutdownHookUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.PluggableEngine;
+import com.lealone.db.PluginManager;
+import com.lealone.db.SysProperties;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerFactory;
+import com.lealone.main.config.Config;
+import com.lealone.main.config.ConfigLoader;
+import com.lealone.main.config.YamlConfigLoader;
+import com.lealone.main.config.Config.PluggableEngineDef;
+import com.lealone.plugins.mongo.server.MongoServerEngine;
+import com.lealone.plugins.mysql.server.MySQLServerEngine;
+import com.lealone.plugins.postgresql.server.PgServerEngine;
+import com.lealone.server.ProtocolServer;
+import com.lealone.server.ProtocolServerEngine;
+import com.lealone.server.TcpServerEngine;
+import com.lealone.server.scheduler.GlobalScheduler;
+import com.lealone.sql.SQLEngine;
+import com.lealone.storage.StorageEngine;
+import com.lealone.transaction.TransactionEngine;
 
 public class Lealone {
 
diff --git a/lealone-main/src/main/java/org/lealone/main/Shell.java b/lealone-main/src/main/java/com/lealone/main/Shell.java
similarity index 86%
rename from lealone-main/src/main/java/org/lealone/main/Shell.java
rename to lealone-main/src/main/java/com/lealone/main/Shell.java
index 4b3b42c62..b2f0ad65c 100644
--- a/lealone-main/src/main/java/org/lealone/main/Shell.java
+++ b/lealone-main/src/main/java/com/lealone/main/Shell.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.main;
+package com.lealone.main;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.lealone.client.LealoneClient;
-import org.lealone.db.ConnectionInfo;
+import com.lealone.client.LealoneClient;
+import com.lealone.db.ConnectionInfo;
 
 public class Shell extends LealoneClient {
 
diff --git a/lealone-main/src/main/java/org/lealone/main/config/Config.java b/lealone-main/src/main/java/com/lealone/main/config/Config.java
similarity index 97%
rename from lealone-main/src/main/java/org/lealone/main/config/Config.java
rename to lealone-main/src/main/java/com/lealone/main/config/Config.java
index 81505efb5..ff47278df 100644
--- a/lealone-main/src/main/java/org/lealone/main/config/Config.java
+++ b/lealone-main/src/main/java/com/lealone/main/config/Config.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.main.config;
+package com.lealone.main.config;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.lealone.common.security.EncryptionOptions.ClientEncryptionOptions;
-import org.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
-import org.lealone.db.Constants;
+import com.lealone.common.security.EncryptionOptions.ClientEncryptionOptions;
+import com.lealone.common.security.EncryptionOptions.ServerEncryptionOptions;
+import com.lealone.db.Constants;
 
 public class Config {
 
diff --git a/lealone-main/src/main/java/org/lealone/main/config/ConfigLoader.java b/lealone-main/src/main/java/com/lealone/main/config/ConfigLoader.java
similarity index 84%
rename from lealone-main/src/main/java/org/lealone/main/config/ConfigLoader.java
rename to lealone-main/src/main/java/com/lealone/main/config/ConfigLoader.java
index beb889941..7d9782f97 100644
--- a/lealone-main/src/main/java/org/lealone/main/config/ConfigLoader.java
+++ b/lealone-main/src/main/java/com/lealone/main/config/ConfigLoader.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.main.config;
+package com.lealone.main.config;
 
-import org.lealone.common.exceptions.ConfigException;
+import com.lealone.common.exceptions.ConfigException;
 
 public interface ConfigLoader {
 
diff --git a/lealone-main/src/main/java/org/lealone/main/config/YamlConfigLoader.java b/lealone-main/src/main/java/com/lealone/main/config/YamlConfigLoader.java
similarity index 93%
rename from lealone-main/src/main/java/org/lealone/main/config/YamlConfigLoader.java
rename to lealone-main/src/main/java/com/lealone/main/config/YamlConfigLoader.java
index d4f33e071..4ca92ac04 100644
--- a/lealone-main/src/main/java/org/lealone/main/config/YamlConfigLoader.java
+++ b/lealone-main/src/main/java/com/lealone/main/config/YamlConfigLoader.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.main.config;
+package com.lealone.main.config;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -12,12 +12,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.lealone.common.exceptions.ConfigException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.main.config.Config.MapPropertyTypeDef;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
@@ -26,6 +20,13 @@
 import org.yaml.snakeyaml.introspector.Property;
 import org.yaml.snakeyaml.introspector.PropertyUtils;
 
+import com.lealone.common.exceptions.ConfigException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.main.config.Config.MapPropertyTypeDef;
+
 public class YamlConfigLoader implements ConfigLoader {
 
     private static final Logger logger = LoggerFactory.getLogger(YamlConfigLoader.class);
diff --git a/lealone-main/src/main/java/org/lealone/main/config/YamlConstructor.java b/lealone-main/src/main/java/com/lealone/main/config/YamlConstructor.java
similarity index 98%
rename from lealone-main/src/main/java/org/lealone/main/config/YamlConstructor.java
rename to lealone-main/src/main/java/com/lealone/main/config/YamlConstructor.java
index 99a8bfe9e..d810850bf 100644
--- a/lealone-main/src/main/java/org/lealone/main/config/YamlConstructor.java
+++ b/lealone-main/src/main/java/com/lealone/main/config/YamlConstructor.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.main.config;
+package com.lealone.main.config;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/lealone-net/pom.xml b/lealone-net/pom.xml
index bb500d212..93eb6e01f 100644
--- a/lealone-net/pom.xml
+++ b/lealone-net/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-common
             ${project.version}
         
diff --git a/lealone-net/src/main/java/org/lealone/net/AsyncConnection.java b/lealone-net/src/main/java/com/lealone/net/AsyncConnection.java
similarity index 94%
rename from lealone-net/src/main/java/org/lealone/net/AsyncConnection.java
rename to lealone-net/src/main/java/com/lealone/net/AsyncConnection.java
index b2e501022..f4010e665 100644
--- a/lealone-net/src/main/java/org/lealone/net/AsyncConnection.java
+++ b/lealone-net/src/main/java/com/lealone/net/AsyncConnection.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
 
 /**
  * An async connection.
diff --git a/lealone-net/src/main/java/org/lealone/net/AsyncConnectionManager.java b/lealone-net/src/main/java/com/lealone/net/AsyncConnectionManager.java
similarity index 87%
rename from lealone-net/src/main/java/org/lealone/net/AsyncConnectionManager.java
rename to lealone-net/src/main/java/com/lealone/net/AsyncConnectionManager.java
index 109c5f1b1..1a0307b66 100644
--- a/lealone-net/src/main/java/org/lealone/net/AsyncConnectionManager.java
+++ b/lealone-net/src/main/java/com/lealone/net/AsyncConnectionManager.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.nio.channels.ServerSocketChannel;
 
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.Scheduler;
 
 public interface AsyncConnectionManager {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/AsyncConnectionPool.java b/lealone-net/src/main/java/com/lealone/net/AsyncConnectionPool.java
similarity index 95%
rename from lealone-net/src/main/java/org/lealone/net/AsyncConnectionPool.java
rename to lealone-net/src/main/java/com/lealone/net/AsyncConnectionPool.java
index 904a3ad09..f603d75b3 100644
--- a/lealone-net/src/main/java/org/lealone/net/AsyncConnectionPool.java
+++ b/lealone-net/src/main/java/com/lealone/net/AsyncConnectionPool.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.lealone.common.util.MapUtils;
-import org.lealone.db.ConnectionSetting;
+import com.lealone.common.util.MapUtils;
+import com.lealone.db.ConnectionSetting;
 
 public class AsyncConnectionPool {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetBuffer.java b/lealone-net/src/main/java/com/lealone/net/NetBuffer.java
similarity index 96%
rename from lealone-net/src/main/java/org/lealone/net/NetBuffer.java
rename to lealone-net/src/main/java/com/lealone/net/NetBuffer.java
index e1fe9ada2..47564d424 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetBuffer.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetBuffer.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.nio.ByteBuffer;
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetBufferFactory.java b/lealone-net/src/main/java/com/lealone/net/NetBufferFactory.java
similarity index 75%
rename from lealone-net/src/main/java/org/lealone/net/NetBufferFactory.java
rename to lealone-net/src/main/java/com/lealone/net/NetBufferFactory.java
index 3c456261a..c8d2a11c1 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetBufferFactory.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetBufferFactory.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataBufferFactory;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataBufferFactory;
 
 public interface NetBufferFactory {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetBufferInputStream.java b/lealone-net/src/main/java/com/lealone/net/NetBufferInputStream.java
similarity index 97%
rename from lealone-net/src/main/java/org/lealone/net/NetBufferInputStream.java
rename to lealone-net/src/main/java/com/lealone/net/NetBufferInputStream.java
index 6a96acc4c..83f697719 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetBufferInputStream.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetBufferInputStream.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/lealone-net/src/main/java/org/lealone/net/NetBufferOutputStream.java b/lealone-net/src/main/java/com/lealone/net/NetBufferOutputStream.java
similarity index 96%
rename from lealone-net/src/main/java/org/lealone/net/NetBufferOutputStream.java
rename to lealone-net/src/main/java/com/lealone/net/NetBufferOutputStream.java
index 92e93e65a..7f2a41a7a 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetBufferOutputStream.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetBufferOutputStream.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.lealone.db.DataBufferFactory;
+import com.lealone.db.DataBufferFactory;
 
 public class NetBufferOutputStream extends OutputStream {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetClient.java b/lealone-net/src/main/java/com/lealone/net/NetClient.java
similarity index 88%
rename from lealone-net/src/main/java/org/lealone/net/NetClient.java
rename to lealone-net/src/main/java/com/lealone/net/NetClient.java
index 4747cc80e..e06573822 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetClient.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetClient.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.net.InetSocketAddress;
 import java.util.Map;
 
-import org.lealone.db.async.Future;
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.db.async.Future;
+import com.lealone.db.scheduler.Scheduler;
 
 public interface NetClient {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetClientBase.java b/lealone-net/src/main/java/com/lealone/net/NetClientBase.java
similarity index 94%
rename from lealone-net/src/main/java/org/lealone/net/NetClientBase.java
rename to lealone-net/src/main/java/com/lealone/net/NetClientBase.java
index d5d43d20b..a5516fcbc 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetClientBase.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetClientBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -13,12 +13,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.lealone.common.util.MapUtils;
-import org.lealone.common.util.ShutdownHookUtils;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.Future;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.nio.NioAttachment;
+import com.lealone.common.util.MapUtils;
+import com.lealone.common.util.ShutdownHookUtils;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.Future;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.nio.NioAttachment;
 
 public abstract class NetClientBase implements NetClient {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetEventLoop.java b/lealone-net/src/main/java/com/lealone/net/NetEventLoop.java
similarity index 91%
rename from lealone-net/src/main/java/org/lealone/net/NetEventLoop.java
rename to lealone-net/src/main/java/com/lealone/net/NetEventLoop.java
index b4b08cd0b..3dbdc2f53 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetEventLoop.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetEventLoop.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.scheduler.Scheduler;
 
 public interface NetEventLoop {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetFactory.java b/lealone-net/src/main/java/com/lealone/net/NetFactory.java
similarity index 88%
rename from lealone-net/src/main/java/org/lealone/net/NetFactory.java
rename to lealone-net/src/main/java/com/lealone/net/NetFactory.java
index 23e6e710f..a387ef167 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetFactory.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetFactory.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
-import org.lealone.db.Plugin;
+import com.lealone.db.Plugin;
 
 public interface NetFactory extends Plugin {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetFactoryBase.java b/lealone-net/src/main/java/com/lealone/net/NetFactoryBase.java
similarity index 81%
rename from lealone-net/src/main/java/org/lealone/net/NetFactoryBase.java
rename to lealone-net/src/main/java/com/lealone/net/NetFactoryBase.java
index 4a8716ae1..554c790ce 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetFactoryBase.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetFactoryBase.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class NetFactoryBase extends PluginBase implements NetFactory {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetFactoryManager.java b/lealone-net/src/main/java/com/lealone/net/NetFactoryManager.java
similarity index 87%
rename from lealone-net/src/main/java/org/lealone/net/NetFactoryManager.java
rename to lealone-net/src/main/java/com/lealone/net/NetFactoryManager.java
index a3c18abb3..2ec7aac30 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetFactoryManager.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetFactoryManager.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.util.Map;
 
-import org.lealone.common.util.MapUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.PluginManager;
-import org.lealone.net.bio.BioNetFactory;
-import org.lealone.net.nio.NioNetFactory;
+import com.lealone.common.util.MapUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.PluginManager;
+import com.lealone.net.bio.BioNetFactory;
+import com.lealone.net.nio.NioNetFactory;
 
 public class NetFactoryManager extends PluginManager {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetScheduler.java b/lealone-net/src/main/java/com/lealone/net/NetScheduler.java
similarity index 88%
rename from lealone-net/src/main/java/org/lealone/net/NetScheduler.java
rename to lealone-net/src/main/java/com/lealone/net/NetScheduler.java
index 35bee723a..245a9b8a7 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetScheduler.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetScheduler.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.scheduler.SchedulerBase;
-import org.lealone.server.ProtocolServer;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.scheduler.SchedulerBase;
+import com.lealone.server.ProtocolServer;
 
 public abstract class NetScheduler extends SchedulerBase {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetServer.java b/lealone-net/src/main/java/com/lealone/net/NetServer.java
similarity index 79%
rename from lealone-net/src/main/java/org/lealone/net/NetServer.java
rename to lealone-net/src/main/java/com/lealone/net/NetServer.java
index 554fe7051..e3dce2e42 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetServer.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetServer.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
-import org.lealone.server.ProtocolServer;
+import com.lealone.server.ProtocolServer;
 
 public interface NetServer extends ProtocolServer {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/NetServerBase.java b/lealone-net/src/main/java/com/lealone/net/NetServerBase.java
similarity index 89%
rename from lealone-net/src/main/java/org/lealone/net/NetServerBase.java
rename to lealone-net/src/main/java/com/lealone/net/NetServerBase.java
index bce73fd3b..d712aca2f 100644
--- a/lealone-net/src/main/java/org/lealone/net/NetServerBase.java
+++ b/lealone-net/src/main/java/com/lealone/net/NetServerBase.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.net.BindException;
 
-import org.lealone.common.exceptions.ConfigException;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.server.ProtocolServerBase;
+import com.lealone.common.exceptions.ConfigException;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.server.ProtocolServerBase;
 
 public abstract class NetServerBase extends ProtocolServerBase implements NetServer {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/TcpClientConnection.java b/lealone-net/src/main/java/com/lealone/net/TcpClientConnection.java
similarity index 94%
rename from lealone-net/src/main/java/org/lealone/net/TcpClientConnection.java
rename to lealone-net/src/main/java/com/lealone/net/TcpClientConnection.java
index ecb81eb74..4733e1ece 100644
--- a/lealone-net/src/main/java/org/lealone/net/TcpClientConnection.java
+++ b/lealone-net/src/main/java/com/lealone/net/TcpClientConnection.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -11,12 +11,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.session.Session;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.session.Session;
 
 /**
  * An async tcp client connection.
diff --git a/lealone-net/src/main/java/org/lealone/net/TransferConnection.java b/lealone-net/src/main/java/com/lealone/net/TransferConnection.java
similarity index 92%
rename from lealone-net/src/main/java/org/lealone/net/TransferConnection.java
rename to lealone-net/src/main/java/com/lealone/net/TransferConnection.java
index 068c197ca..95a0bea1f 100644
--- a/lealone-net/src/main/java/org/lealone/net/TransferConnection.java
+++ b/lealone-net/src/main/java/com/lealone/net/TransferConnection.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -11,14 +11,14 @@
 import java.nio.ByteBuffer;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.exceptions.JdbcSQLException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.session.Session;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.JdbcSQLException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.session.Session;
 
 public abstract class TransferConnection extends AsyncConnection {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/TransferInputStream.java b/lealone-net/src/main/java/com/lealone/net/TransferInputStream.java
similarity index 89%
rename from lealone-net/src/main/java/org/lealone/net/TransferInputStream.java
rename to lealone-net/src/main/java/com/lealone/net/TransferInputStream.java
index fde3eeca1..27fbe8cf3 100644
--- a/lealone-net/src/main/java/org/lealone/net/TransferInputStream.java
+++ b/lealone-net/src/main/java/com/lealone/net/TransferInputStream.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.DataInputStream;
 import java.io.EOFException;
@@ -13,40 +13,40 @@
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SimpleResultSet;
-import org.lealone.db.session.Session;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueEnum;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueJavaObject;
-import org.lealone.db.value.ValueList;
-import org.lealone.db.value.ValueLob;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueMap;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.db.value.ValueSet;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueStringFixed;
-import org.lealone.db.value.ValueStringIgnoreCase;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SimpleResultSet;
+import com.lealone.db.session.Session;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueEnum;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueJavaObject;
+import com.lealone.db.value.ValueList;
+import com.lealone.db.value.ValueLob;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueMap;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.db.value.ValueSet;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueStringFixed;
+import com.lealone.db.value.ValueStringIgnoreCase;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
 
 /**
  * The transfer class is used to receive Value objects.
diff --git a/lealone-net/src/main/java/org/lealone/net/TransferOutputStream.java b/lealone-net/src/main/java/com/lealone/net/TransferOutputStream.java
similarity index 95%
rename from lealone-net/src/main/java/org/lealone/net/TransferOutputStream.java
rename to lealone-net/src/main/java/com/lealone/net/TransferOutputStream.java
index fe06bbea2..18313b883 100644
--- a/lealone-net/src/main/java/org/lealone/net/TransferOutputStream.java
+++ b/lealone-net/src/main/java/com/lealone/net/TransferOutputStream.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -17,26 +17,26 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.Session;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueList;
-import org.lealone.db.value.ValueLob;
-import org.lealone.db.value.ValueMap;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.db.value.ValueSet;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
-import org.lealone.server.protocol.PacketType;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.Session;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueList;
+import com.lealone.db.value.ValueLob;
+import com.lealone.db.value.ValueMap;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.db.value.ValueSet;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
+import com.lealone.server.protocol.PacketType;
 
 /**
  * The transfer class is used to send Value objects.
diff --git a/lealone-net/src/main/java/org/lealone/net/WritableChannel.java b/lealone-net/src/main/java/com/lealone/net/WritableChannel.java
similarity index 96%
rename from lealone-net/src/main/java/org/lealone/net/WritableChannel.java
rename to lealone-net/src/main/java/com/lealone/net/WritableChannel.java
index 7c874a5ed..16e4f9dc0 100644
--- a/lealone-net/src/main/java/org/lealone/net/WritableChannel.java
+++ b/lealone-net/src/main/java/com/lealone/net/WritableChannel.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net;
+package com.lealone.net;
 
 import java.nio.channels.SocketChannel;
 
diff --git a/lealone-net/src/main/java/org/lealone/net/bio/BioNetClient.java b/lealone-net/src/main/java/com/lealone/net/bio/BioNetClient.java
similarity index 80%
rename from lealone-net/src/main/java/org/lealone/net/bio/BioNetClient.java
rename to lealone-net/src/main/java/com/lealone/net/bio/BioNetClient.java
index 141816998..ce4e2805d 100644
--- a/lealone-net/src/main/java/org/lealone/net/bio/BioNetClient.java
+++ b/lealone-net/src/main/java/com/lealone/net/bio/BioNetClient.java
@@ -3,22 +3,22 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.bio;
+package com.lealone.net.bio;
 
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Map;
 
-import org.lealone.common.util.MapUtils;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.Constants;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.AsyncConnectionManager;
-import org.lealone.net.NetClientBase;
-import org.lealone.net.NetNode;
-import org.lealone.net.TcpClientConnection;
+import com.lealone.common.util.MapUtils;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.Constants;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.AsyncConnectionManager;
+import com.lealone.net.NetClientBase;
+import com.lealone.net.NetNode;
+import com.lealone.net.TcpClientConnection;
 
 class BioNetClient extends NetClientBase {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/bio/BioNetFactory.java b/lealone-net/src/main/java/com/lealone/net/bio/BioNetFactory.java
similarity index 77%
rename from lealone-net/src/main/java/org/lealone/net/bio/BioNetFactory.java
rename to lealone-net/src/main/java/com/lealone/net/bio/BioNetFactory.java
index eb3fe14bc..de3ed8e6d 100644
--- a/lealone-net/src/main/java/org/lealone/net/bio/BioNetFactory.java
+++ b/lealone-net/src/main/java/com/lealone/net/bio/BioNetFactory.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.bio;
+package com.lealone.net.bio;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.net.NetClient;
-import org.lealone.net.NetFactoryBase;
-import org.lealone.net.NetServer;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.net.NetClient;
+import com.lealone.net.NetFactoryBase;
+import com.lealone.net.NetServer;
 
 public class BioNetFactory extends NetFactoryBase {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/bio/BioWritableChannel.java b/lealone-net/src/main/java/com/lealone/net/bio/BioWritableChannel.java
similarity index 90%
rename from lealone-net/src/main/java/org/lealone/net/bio/BioWritableChannel.java
rename to lealone-net/src/main/java/com/lealone/net/bio/BioWritableChannel.java
index 79a117735..10946f113 100644
--- a/lealone-net/src/main/java/org/lealone/net/bio/BioWritableChannel.java
+++ b/lealone-net/src/main/java/com/lealone/net/bio/BioWritableChannel.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.bio;
+package com.lealone.net.bio;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -15,15 +15,15 @@
 import java.nio.ByteBuffer;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MapUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.NetBuffer;
-import org.lealone.net.NetBufferFactory;
-import org.lealone.net.WritableChannel;
-import org.lealone.net.nio.NioBuffer;
-import org.lealone.net.nio.NioBufferFactory;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MapUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.NetBufferFactory;
+import com.lealone.net.WritableChannel;
+import com.lealone.net.nio.NioBuffer;
+import com.lealone.net.nio.NioBufferFactory;
 
 public class BioWritableChannel implements WritableChannel {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioAttachment.java b/lealone-net/src/main/java/com/lealone/net/nio/NioAttachment.java
similarity index 71%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioAttachment.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioAttachment.java
index 9682ccbd8..c1190bdb8 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioAttachment.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioAttachment.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.net.AsyncConnection;
+import com.lealone.db.DataBuffer;
+import com.lealone.net.AsyncConnection;
 
 public class NioAttachment {
     public AsyncConnection conn;
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioBuffer.java b/lealone-net/src/main/java/com/lealone/net/nio/NioBuffer.java
similarity index 95%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioBuffer.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioBuffer.java
index 50897fc06..99cb7ae53 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioBuffer.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioBuffer.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.net.NetBuffer;
+import com.lealone.db.DataBuffer;
+import com.lealone.net.NetBuffer;
 
 public class NioBuffer implements NetBuffer {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioBufferFactory.java b/lealone-net/src/main/java/com/lealone/net/nio/NioBufferFactory.java
similarity index 82%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioBufferFactory.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioBufferFactory.java
index a5bc8ee1d..a80a4646f 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioBufferFactory.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioBufferFactory.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.net.NetBufferFactory;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.net.NetBufferFactory;
 
 public class NioBufferFactory implements NetBufferFactory {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioClient.java b/lealone-net/src/main/java/com/lealone/net/nio/NioClient.java
similarity index 84%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioClient.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioClient.java
index db459c156..36d33f05f 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioClient.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioClient.java
@@ -3,21 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
 import java.net.InetSocketAddress;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.util.Map;
 
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.AsyncConnectionManager;
-import org.lealone.net.AsyncConnectionPool;
-import org.lealone.net.NetClientBase;
-import org.lealone.net.NetEventLoop;
-import org.lealone.net.NetNode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.AsyncConnectionManager;
+import com.lealone.net.AsyncConnectionPool;
+import com.lealone.net.NetClientBase;
+import com.lealone.net.NetEventLoop;
+import com.lealone.net.NetNode;
 
 class NioClient extends NetClientBase {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioEventLoop.java b/lealone-net/src/main/java/com/lealone/net/nio/NioEventLoop.java
similarity index 96%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioEventLoop.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioEventLoop.java
index 0b303158c..76621aa46 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioEventLoop.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioEventLoop.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -25,21 +25,21 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.MapUtils;
-import org.lealone.common.util.SystemPropertyUtils;
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerThread;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.NetBuffer;
-import org.lealone.net.NetClient;
-import org.lealone.net.NetClientBase.ClientAttachment;
-import org.lealone.net.NetEventLoop;
-import org.lealone.net.TcpClientConnection;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.MapUtils;
+import com.lealone.common.util.SystemPropertyUtils;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerThread;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.NetClient;
+import com.lealone.net.NetEventLoop;
+import com.lealone.net.TcpClientConnection;
+import com.lealone.net.NetClientBase.ClientAttachment;
 
 class NioEventLoop implements NetEventLoop {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioNetFactory.java b/lealone-net/src/main/java/com/lealone/net/nio/NioNetFactory.java
similarity index 81%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioNetFactory.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioNetFactory.java
index 553bb6fdd..d3deef088 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioNetFactory.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioNetFactory.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
-import org.lealone.db.Constants;
-import org.lealone.net.NetClient;
-import org.lealone.net.NetFactoryBase;
-import org.lealone.net.NetServer;
+import com.lealone.db.Constants;
+import com.lealone.net.NetClient;
+import com.lealone.net.NetFactoryBase;
+import com.lealone.net.NetServer;
 
 public class NioNetFactory extends NetFactoryBase {
 
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioServerAccepter.java b/lealone-net/src/main/java/com/lealone/net/nio/NioServerAccepter.java
similarity index 90%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioServerAccepter.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioServerAccepter.java
index 5af56bcd7..9709cf76e 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioServerAccepter.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioServerAccepter.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
 import java.net.InetSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.NetServerBase;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.NetServerBase;
 
 //负责接收新的ProtocolServer连接，比如TCP、P2P
 //TODO 1.支持SSL 2.支持配置参数
diff --git a/lealone-net/src/main/java/org/lealone/net/nio/NioWritableChannel.java b/lealone-net/src/main/java/com/lealone/net/nio/NioWritableChannel.java
similarity index 90%
rename from lealone-net/src/main/java/org/lealone/net/nio/NioWritableChannel.java
rename to lealone-net/src/main/java/com/lealone/net/nio/NioWritableChannel.java
index 36f8be6d0..68a3ddd05 100644
--- a/lealone-net/src/main/java/org/lealone/net/nio/NioWritableChannel.java
+++ b/lealone-net/src/main/java/com/lealone/net/nio/NioWritableChannel.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.net.nio;
+package com.lealone.net.nio;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.channels.SocketChannel;
 
-import org.lealone.net.NetBuffer;
-import org.lealone.net.NetBufferFactory;
-import org.lealone.net.NetEventLoop;
-import org.lealone.net.WritableChannel;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.NetBufferFactory;
+import com.lealone.net.NetEventLoop;
+import com.lealone.net.WritableChannel;
 
 class NioWritableChannel implements WritableChannel {
 
diff --git a/lealone-plugins/mongo/pom.xml b/lealone-plugins/mongo/pom.xml
index cd1bab8c2..3ff6606f4 100644
--- a/lealone-plugins/mongo/pom.xml
+++ b/lealone-plugins/mongo/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone.plugins
+        com.lealone.plugins
         lealone-plugins
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-server
             ${project.version}
         
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/BsonBase.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/BsonBase.java
similarity index 87%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/BsonBase.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/BsonBase.java
index 109cb22fa..d235a18da 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/BsonBase.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/BsonBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson;
+package com.lealone.plugins.mongo.bson;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -26,27 +26,28 @@
 import org.bson.BsonValue;
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueMap;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.plugins.mongo.bson.operator.BOQueryOperator;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.optimizer.TableFilter;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueMap;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.plugins.mongo.bson.operator.BOQueryOperator;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.optimizer.TableFilter;
 
 public abstract class BsonBase {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCAggregate.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCAggregate.java
similarity index 94%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCAggregate.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCAggregate.java
index d469f5554..2796882f6 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCAggregate.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCAggregate.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command;
+package com.lealone.plugins.mongo.bson.command;
 
 import java.util.ArrayList;
 import java.util.Map.Entry;
@@ -12,18 +12,19 @@
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.Utils;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Select;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.Utils;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Select;
 
 public class BCAggregate extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCDelete.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCDelete.java
similarity index 82%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCDelete.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCDelete.java
index c2819a8d9..31973201f 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCDelete.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCDelete.java
@@ -3,19 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command;
+package com.lealone.plugins.mongo.bson.command;
 
 import java.util.ArrayList;
 
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
-import org.lealone.sql.dml.Delete;
-import org.lealone.sql.optimizer.TableFilter;
+
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
+import com.lealone.sql.dml.Delete;
+import com.lealone.sql.optimizer.TableFilter;
 
 public class BCDelete extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCFind.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCFind.java
similarity index 87%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCFind.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCFind.java
index 06a757625..5c9114e01 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCFind.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCFind.java
@@ -3,24 +3,25 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command;
+package com.lealone.plugins.mongo.bson.command;
 
 import java.util.ArrayList;
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.util.Utils;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Wildcard;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Select;
+
+import com.lealone.common.util.Utils;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Wildcard;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Select;
 
 public class BCFind extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCInsert.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCInsert.java
similarity index 86%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCInsert.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCInsert.java
index bfa48e63c..17aeadb22 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCInsert.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCInsert.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command;
+package com.lealone.plugins.mongo.bson.command;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -12,18 +12,19 @@
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
-import org.lealone.sql.dml.Insert;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
+import com.lealone.sql.dml.Insert;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 public class BCInsert extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCUpdate.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCUpdate.java
similarity index 80%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCUpdate.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCUpdate.java
index b875d4426..aca1a039d 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BCUpdate.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BCUpdate.java
@@ -3,19 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command;
+package com.lealone.plugins.mongo.bson.command;
 
 import java.util.ArrayList;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.bson.operator.BOUpdateOperator;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
-import org.lealone.sql.dml.Update;
-import org.lealone.sql.optimizer.TableFilter;
+
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.bson.operator.BOUpdateOperator;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
+import com.lealone.sql.dml.Update;
+import com.lealone.sql.optimizer.TableFilter;
 
 public class BCUpdate extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BsonCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BsonCommand.java
similarity index 90%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BsonCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BsonCommand.java
index 147908279..d7d6b3430 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/BsonCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/BsonCommand.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command;
+package com.lealone.plugins.mongo.bson.command;
 
 import java.util.ArrayList;
 import java.util.Map.Entry;
@@ -16,30 +16,31 @@
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.auth.User;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.bson.BsonBase;
-import org.lealone.plugins.mongo.bson.command.admin.AdminCommand;
-import org.lealone.plugins.mongo.bson.command.auth.AuthCommand;
-import org.lealone.plugins.mongo.bson.command.diagnostic.DiagnosticCommand;
-import org.lealone.plugins.mongo.bson.command.index.IndexCommand;
-import org.lealone.plugins.mongo.bson.command.role.RoleCommand;
-import org.lealone.plugins.mongo.bson.command.sessions.SessionsCommand;
-import org.lealone.plugins.mongo.bson.command.user.UserCommand;
-import org.lealone.plugins.mongo.server.MongoServer;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.auth.User;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.bson.BsonBase;
+import com.lealone.plugins.mongo.bson.command.admin.AdminCommand;
+import com.lealone.plugins.mongo.bson.command.auth.AuthCommand;
+import com.lealone.plugins.mongo.bson.command.diagnostic.DiagnosticCommand;
+import com.lealone.plugins.mongo.bson.command.index.IndexCommand;
+import com.lealone.plugins.mongo.bson.command.role.RoleCommand;
+import com.lealone.plugins.mongo.bson.command.sessions.SessionsCommand;
+import com.lealone.plugins.mongo.bson.command.user.UserCommand;
+import com.lealone.plugins.mongo.server.MongoServer;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
 
 public abstract class BsonCommand extends BsonBase {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/ACCreate.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/ACCreate.java
similarity index 87%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/ACCreate.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/ACCreate.java
index 8726b7f0d..b2ee40fa3 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/ACCreate.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/ACCreate.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.admin;
+package com.lealone.plugins.mongo.bson.command.admin;
 
 import java.util.Map.Entry;
 
@@ -12,9 +12,10 @@
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public class ACCreate extends AdminCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/ACDrop.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/ACDrop.java
similarity index 78%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/ACDrop.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/ACDrop.java
index 923c44793..f2297362b 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/ACDrop.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/ACDrop.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.admin;
+package com.lealone.plugins.mongo.bson.command.admin;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public class ACDrop extends AdminCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/AdminCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/AdminCommand.java
similarity index 85%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/AdminCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/AdminCommand.java
index 51240d238..79386141e 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/admin/AdminCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/admin/AdminCommand.java
@@ -3,20 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.admin;
+package com.lealone.plugins.mongo.bson.command.admin;
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableView;
-import org.lealone.plugins.mongo.bson.command.BCFind;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableView;
+import com.lealone.plugins.mongo.bson.command.BCFind;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public abstract class AdminCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/AuthCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/AuthCommand.java
similarity index 89%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/AuthCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/AuthCommand.java
index 19574fe89..55599b356 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/AuthCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/AuthCommand.java
@@ -3,19 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.auth;
+package com.lealone.plugins.mongo.bson.command.auth;
 
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.auth.User;
-import org.lealone.db.auth.scram.ScramPasswordData;
-import org.lealone.db.auth.scram.ScramPasswordHash;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.auth.User;
+import com.lealone.db.auth.scram.ScramPasswordData;
+import com.lealone.db.auth.scram.ScramPasswordHash;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public abstract class AuthCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java
similarity index 98%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java
index 6bbf69142..dcdbdafa1 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/ScramSaslProcessor.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mongo.bson.command.auth;
+package com.lealone.plugins.mongo.bson.command.auth;
 
 import java.util.UUID;
 
-import org.lealone.db.auth.scram.ScramPasswordData;
+import com.lealone.db.auth.scram.ScramPasswordData;
 
 /**
  * Provides server side processing of the SCRAM SASL authentication
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java
similarity index 97%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java
index e1cd0017d..61b800015 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/auth/ScramServerFunctionality.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mongo.bson.command.auth;
+package com.lealone.plugins.mongo.bson.command.auth;
 
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
@@ -23,8 +23,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.lealone.db.auth.scram.ScramPasswordData;
-import org.lealone.db.auth.scram.ScramPasswordHash;
+import com.lealone.db.auth.scram.ScramPasswordData;
+import com.lealone.db.auth.scram.ScramPasswordHash;
 
 /**
  * Provides building blocks for creating SCRAM authentication server
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java
similarity index 85%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java
index 60efec185..d7cfc9ffb 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/diagnostic/DiagnosticCommand.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.diagnostic;
+package com.lealone.plugins.mongo.bson.command.diagnostic;
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public abstract class DiagnosticCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java
similarity index 86%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java
index 34a362bf3..8c433ab98 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICCreateIndexes.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.index;
+package com.lealone.plugins.mongo.bson.command.index;
 
 import java.util.Map.Entry;
 
@@ -11,10 +11,11 @@
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public class ICCreateIndexes extends IndexCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java
similarity index 82%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java
index 3bc06936d..fa7a939f9 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICDropIndexes.java
@@ -3,18 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.index;
+package com.lealone.plugins.mongo.bson.command.index;
 
 import java.util.ArrayList;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.index.Index;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.index.Index;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public class ICDropIndexes extends IndexCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICListIndexes.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICListIndexes.java
similarity index 85%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICListIndexes.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICListIndexes.java
index fc8858789..17835355c 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/ICListIndexes.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/ICListIndexes.java
@@ -3,17 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.index;
+package com.lealone.plugins.mongo.bson.command.index;
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.table.Table;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.table.Table;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public class ICListIndexes extends IndexCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/IndexCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/IndexCommand.java
similarity index 77%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/IndexCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/IndexCommand.java
index a4396ecf9..9d459f671 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/index/IndexCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/index/IndexCommand.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.index;
+package com.lealone.plugins.mongo.bson.command.index;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public abstract class IndexCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCDelete.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCDelete.java
similarity index 85%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCDelete.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCDelete.java
index 2aceb0dd6..433bea57b 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCDelete.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCDelete.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.legacy;
+package com.lealone.plugins.mongo.bson.command.legacy;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
+
+import com.lealone.plugins.mongo.server.MongoServerConnection;
 
 public class LCDelete extends LegacyCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCInsert.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCInsert.java
similarity index 85%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCInsert.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCInsert.java
index cbdda812b..e13121231 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCInsert.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCInsert.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.legacy;
+package com.lealone.plugins.mongo.bson.command.legacy;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
+
+import com.lealone.plugins.mongo.server.MongoServerConnection;
 
 public class LCInsert extends LegacyCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCQuery.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCQuery.java
similarity index 87%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCQuery.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCQuery.java
index 9bc45165e..efbc05d12 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCQuery.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCQuery.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.legacy;
+package com.lealone.plugins.mongo.bson.command.legacy;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
+
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
 
 public class LCQuery extends LegacyCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java
similarity index 86%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java
index d10260734..fd386ec79 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LCUpdate.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.legacy;
+package com.lealone.plugins.mongo.bson.command.legacy;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
+
+import com.lealone.plugins.mongo.server.MongoServerConnection;
 
 public class LCUpdate extends LegacyCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java
similarity index 62%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java
index 084b64a6c..804f99dd4 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/legacy/LegacyCommand.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.legacy;
+package com.lealone.plugins.mongo.bson.command.legacy;
 
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
 
 public abstract class LegacyCommand extends BsonCommand {
 }
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/role/RoleCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/role/RoleCommand.java
similarity index 93%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/role/RoleCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/role/RoleCommand.java
index 5ebf42681..91c44ebeb 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/role/RoleCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/role/RoleCommand.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.role;
+package com.lealone.plugins.mongo.bson.command.role;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public abstract class RoleCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java
similarity index 89%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java
index 17080d2dd..779400a6a 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/sessions/SessionsCommand.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.sessions;
+package com.lealone.plugins.mongo.bson.command.sessions;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,11 +14,12 @@
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public class SessionsCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/user/UserCommand.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/user/UserCommand.java
similarity index 93%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/user/UserCommand.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/user/UserCommand.java
index 4b4ee7058..1b466996e 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/command/user/UserCommand.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/command/user/UserCommand.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.command.user;
+package com.lealone.plugins.mongo.bson.command.user;
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
@@ -11,13 +11,14 @@
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.auth.User;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.server.MongoServerConnection;
-import org.lealone.plugins.mongo.server.MongoTask;
+
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.auth.User;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.server.MongoServerConnection;
+import com.lealone.plugins.mongo.server.MongoTask;
 
 public abstract class UserCommand extends BsonCommand {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java
similarity index 96%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java
index 5526270ce..623e41cb2 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOAggregateOperator.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.operator;
+package com.lealone.plugins.mongo.bson.operator;
 
 import java.util.Map.Entry;
 
@@ -11,18 +11,19 @@
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.BsonValue;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Operation;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.condition.ConditionNot;
-import org.lealone.sql.optimizer.TableFilter;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Operation;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.condition.ConditionNot;
+import com.lealone.sql.optimizer.TableFilter;
 
 public class BOAggregateOperator extends BOQueryOperator {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOQueryOperator.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOQueryOperator.java
similarity index 92%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOQueryOperator.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOQueryOperator.java
index a9030408c..bad358d14 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOQueryOperator.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOQueryOperator.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.operator;
+package com.lealone.plugins.mongo.bson.operator;
 
 import java.util.ArrayList;
 import java.util.Map.Entry;
@@ -11,14 +11,15 @@
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.condition.ConditionInConstantSet;
-import org.lealone.sql.expression.condition.ConditionNot;
-import org.lealone.sql.optimizer.TableFilter;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.condition.ConditionInConstantSet;
+import com.lealone.sql.expression.condition.ConditionNot;
+import com.lealone.sql.optimizer.TableFilter;
 
 public class BOQueryOperator extends BsonOperator {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java
similarity index 88%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java
index b84ac2096..223e31e89 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BOUpdateOperator.java
@@ -3,23 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.operator;
+package com.lealone.plugins.mongo.bson.operator;
 
 import java.util.Map.Entry;
 
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.sql.dml.Update;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Operation;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.optimizer.TableFilter;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.sql.dml.Update;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Operation;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.optimizer.TableFilter;
 
 public class BOUpdateOperator extends BsonOperator {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BsonOperator.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BsonOperator.java
similarity index 80%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BsonOperator.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BsonOperator.java
index 436bd7bcd..87cba2199 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/bson/operator/BsonOperator.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/bson/operator/BsonOperator.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.bson.operator;
+package com.lealone.plugins.mongo.bson.operator;
 
 import org.bson.BsonArray;
 import org.bson.BsonValue;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.plugins.mongo.bson.BsonBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.function.Function;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.plugins.mongo.bson.BsonBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.function.Function;
 
 public abstract class BsonOperator extends BsonBase {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServer.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServer.java
similarity index 83%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServer.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServer.java
index 7e01055c3..3f851ef79 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServer.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServer.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.server;
+package com.lealone.plugins.mongo.server;
 
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.WritableChannel;
-import org.lealone.server.AsyncServer;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.WritableChannel;
+import com.lealone.server.AsyncServer;
 
 public class MongoServer extends AsyncServer {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServerConnection.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServerConnection.java
similarity index 89%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServerConnection.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServerConnection.java
index f58b0b80e..4f3f4d9b0 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServerConnection.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServerConnection.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.server;
+package com.lealone.plugins.mongo.server;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -19,25 +19,26 @@
 import org.bson.codecs.EncoderContext;
 import org.bson.io.BasicOutputBuffer;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.net.NetBuffer;
-import org.lealone.net.NetBufferOutputStream;
-import org.lealone.net.WritableChannel;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.plugins.mongo.bson.command.auth.ScramSaslProcessor;
-import org.lealone.plugins.mongo.bson.command.legacy.LCDelete;
-import org.lealone.plugins.mongo.bson.command.legacy.LCInsert;
-import org.lealone.plugins.mongo.bson.command.legacy.LCQuery;
-import org.lealone.plugins.mongo.bson.command.legacy.LCUpdate;
-import org.lealone.server.AsyncServerConnection;
-import org.lealone.server.scheduler.SessionInfo;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.NetBufferOutputStream;
+import com.lealone.net.WritableChannel;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.plugins.mongo.bson.command.auth.ScramSaslProcessor;
+import com.lealone.plugins.mongo.bson.command.legacy.LCDelete;
+import com.lealone.plugins.mongo.bson.command.legacy.LCInsert;
+import com.lealone.plugins.mongo.bson.command.legacy.LCQuery;
+import com.lealone.plugins.mongo.bson.command.legacy.LCUpdate;
+import com.lealone.server.AsyncServerConnection;
+import com.lealone.server.scheduler.SessionInfo;
 
 public class MongoServerConnection extends AsyncServerConnection {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServerEngine.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServerEngine.java
similarity index 75%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServerEngine.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServerEngine.java
index 0909747d3..d5c603d98 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoServerEngine.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoServerEngine.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.server;
+package com.lealone.plugins.mongo.server;
 
-import org.lealone.server.ProtocolServer;
-import org.lealone.server.ProtocolServerEngineBase;
+import com.lealone.server.ProtocolServer;
+import com.lealone.server.ProtocolServerEngineBase;
 
 public class MongoServerEngine extends ProtocolServerEngineBase {
 
diff --git a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoTask.java b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoTask.java
similarity index 80%
rename from lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoTask.java
rename to lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoTask.java
index dbb2c8a61..f9530fb04 100644
--- a/lealone-plugins/mongo/src/main/java/org/lealone/plugins/mongo/server/MongoTask.java
+++ b/lealone-plugins/mongo/src/main/java/com/lealone/plugins/mongo/server/MongoTask.java
@@ -3,17 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mongo.server;
+package com.lealone.plugins.mongo.server;
 
 import org.bson.BsonDocument;
 import org.bson.io.ByteBufferBsonInput;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.session.ServerSession;
-import org.lealone.net.NetBuffer;
-import org.lealone.plugins.mongo.bson.command.BsonCommand;
-import org.lealone.server.scheduler.LinkableTask;
-import org.lealone.server.scheduler.SessionInfo;
+
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.session.ServerSession;
+import com.lealone.net.NetBuffer;
+import com.lealone.plugins.mongo.bson.command.BsonCommand;
+import com.lealone.server.scheduler.LinkableTask;
+import com.lealone.server.scheduler.SessionInfo;
 
 public class MongoTask extends LinkableTask {
 
diff --git a/lealone-plugins/mongo/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine b/lealone-plugins/mongo/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
new file mode 100644
index 000000000..4b2ef7b74
--- /dev/null
+++ b/lealone-plugins/mongo/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
@@ -0,0 +1 @@
+com.lealone.plugins.mongo.server.MongoServerEngine
\ No newline at end of file
diff --git a/lealone-plugins/mongo/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine b/lealone-plugins/mongo/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
deleted file mode 100644
index 2c5444b79..000000000
--- a/lealone-plugins/mongo/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.plugins.mongo.server.MongoServerEngine
\ No newline at end of file
diff --git a/lealone-plugins/mysql/pom.xml b/lealone-plugins/mysql/pom.xml
index b52c523fc..beb7032b8 100644
--- a/lealone-plugins/mysql/pom.xml
+++ b/lealone-plugins/mysql/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone.plugins
+        com.lealone.plugins
         lealone-plugins
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-server
             ${project.version}
         
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServer.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServer.java
similarity index 86%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServer.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServer.java
index 6f8b4f370..8b5b1a310 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServer.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServer.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server;
+package com.lealone.plugins.mysql.server;
 
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.PluginManager;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.WritableChannel;
-import org.lealone.plugins.mysql.sql.expression.function.MySQLFunctionFactory;
-import org.lealone.server.AsyncServer;
-import org.lealone.storage.StorageEngine;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.PluginManager;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.WritableChannel;
+import com.lealone.plugins.mysql.sql.expression.function.MySQLFunctionFactory;
+import com.lealone.server.AsyncServer;
+import com.lealone.storage.StorageEngine;
 
 public class MySQLServer extends AsyncServer {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServerConnection.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServerConnection.java
similarity index 85%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServerConnection.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServerConnection.java
index fdaacfd7f..611a4afe5 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServerConnection.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServerConnection.java
@@ -3,52 +3,52 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server;
+package com.lealone.plugins.mysql.server;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
 import java.util.Properties;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.ManualCloseable;
-import org.lealone.db.PluginManager;
-import org.lealone.db.result.Result;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.net.NetBuffer;
-import org.lealone.net.NetBufferOutputStream;
-import org.lealone.net.WritableChannel;
-import org.lealone.plugins.mysql.server.handler.AuthPacketHandler;
-import org.lealone.plugins.mysql.server.handler.CommandPacketHandler;
-import org.lealone.plugins.mysql.server.handler.PacketHandler;
-import org.lealone.plugins.mysql.server.protocol.AuthPacket;
-import org.lealone.plugins.mysql.server.protocol.EOFPacket;
-import org.lealone.plugins.mysql.server.protocol.ErrorPacket;
-import org.lealone.plugins.mysql.server.protocol.ExecutePacket;
-import org.lealone.plugins.mysql.server.protocol.FieldPacket;
-import org.lealone.plugins.mysql.server.protocol.Fields;
-import org.lealone.plugins.mysql.server.protocol.HandshakePacket;
-import org.lealone.plugins.mysql.server.protocol.OkPacket;
-import org.lealone.plugins.mysql.server.protocol.Packet;
-import org.lealone.plugins.mysql.server.protocol.PacketInput;
-import org.lealone.plugins.mysql.server.protocol.PacketOutput;
-import org.lealone.plugins.mysql.server.protocol.PreparedOkPacket;
-import org.lealone.plugins.mysql.server.protocol.ResultSetHeaderPacket;
-import org.lealone.plugins.mysql.server.protocol.RowDataPacket;
-import org.lealone.server.AsyncServerConnection;
-import org.lealone.server.scheduler.SessionInfo;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLEngine;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.ddl.CreateDatabase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.ManualCloseable;
+import com.lealone.db.PluginManager;
+import com.lealone.db.result.Result;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.NetBufferOutputStream;
+import com.lealone.net.WritableChannel;
+import com.lealone.plugins.mysql.server.handler.AuthPacketHandler;
+import com.lealone.plugins.mysql.server.handler.CommandPacketHandler;
+import com.lealone.plugins.mysql.server.handler.PacketHandler;
+import com.lealone.plugins.mysql.server.protocol.AuthPacket;
+import com.lealone.plugins.mysql.server.protocol.EOFPacket;
+import com.lealone.plugins.mysql.server.protocol.ErrorPacket;
+import com.lealone.plugins.mysql.server.protocol.ExecutePacket;
+import com.lealone.plugins.mysql.server.protocol.FieldPacket;
+import com.lealone.plugins.mysql.server.protocol.Fields;
+import com.lealone.plugins.mysql.server.protocol.HandshakePacket;
+import com.lealone.plugins.mysql.server.protocol.OkPacket;
+import com.lealone.plugins.mysql.server.protocol.Packet;
+import com.lealone.plugins.mysql.server.protocol.PacketInput;
+import com.lealone.plugins.mysql.server.protocol.PacketOutput;
+import com.lealone.plugins.mysql.server.protocol.PreparedOkPacket;
+import com.lealone.plugins.mysql.server.protocol.ResultSetHeaderPacket;
+import com.lealone.plugins.mysql.server.protocol.RowDataPacket;
+import com.lealone.server.AsyncServerConnection;
+import com.lealone.server.scheduler.SessionInfo;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLEngine;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.ddl.CreateDatabase;
 
 public class MySQLServerConnection extends AsyncServerConnection {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServerEngine.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServerEngine.java
similarity index 75%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServerEngine.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServerEngine.java
index 6114f0396..5a0932edd 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/MySQLServerEngine.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/MySQLServerEngine.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server;
+package com.lealone.plugins.mysql.server;
 
-import org.lealone.server.ProtocolServer;
-import org.lealone.server.ProtocolServerEngineBase;
+import com.lealone.server.ProtocolServer;
+import com.lealone.server.ProtocolServerEngineBase;
 
 public class MySQLServerEngine extends ProtocolServerEngineBase {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/AuthPacketHandler.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/AuthPacketHandler.java
similarity index 68%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/AuthPacketHandler.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/AuthPacketHandler.java
index 241156a68..f74b826ea 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/AuthPacketHandler.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/AuthPacketHandler.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.handler;
+package com.lealone.plugins.mysql.server.handler;
 
-import org.lealone.plugins.mysql.server.MySQLServerConnection;
-import org.lealone.plugins.mysql.server.protocol.AuthPacket;
-import org.lealone.plugins.mysql.server.protocol.PacketInput;
+import com.lealone.plugins.mysql.server.MySQLServerConnection;
+import com.lealone.plugins.mysql.server.protocol.AuthPacket;
+import com.lealone.plugins.mysql.server.protocol.PacketInput;
 
 public class AuthPacketHandler implements PacketHandler {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/CommandPacketHandler.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/CommandPacketHandler.java
similarity index 81%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/CommandPacketHandler.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/CommandPacketHandler.java
index 17b6bac41..d0127c5d9 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/CommandPacketHandler.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/CommandPacketHandler.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.handler;
+package com.lealone.plugins.mysql.server.handler;
 
-import org.lealone.plugins.mysql.server.MySQLServerConnection;
-import org.lealone.plugins.mysql.server.protocol.ErrorCode;
-import org.lealone.plugins.mysql.server.protocol.ExecutePacket;
-import org.lealone.plugins.mysql.server.protocol.InitDbPacket;
-import org.lealone.plugins.mysql.server.protocol.PacketInput;
-import org.lealone.plugins.mysql.server.protocol.PacketType;
+import com.lealone.plugins.mysql.server.MySQLServerConnection;
+import com.lealone.plugins.mysql.server.protocol.ErrorCode;
+import com.lealone.plugins.mysql.server.protocol.ExecutePacket;
+import com.lealone.plugins.mysql.server.protocol.InitDbPacket;
+import com.lealone.plugins.mysql.server.protocol.PacketInput;
+import com.lealone.plugins.mysql.server.protocol.PacketType;
 
 public class CommandPacketHandler implements PacketHandler {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/PacketHandler.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/PacketHandler.java
similarity index 63%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/PacketHandler.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/PacketHandler.java
index fba3dadcf..7659314c3 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/handler/PacketHandler.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/handler/PacketHandler.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.handler;
+package com.lealone.plugins.mysql.server.handler;
 
-import org.lealone.plugins.mysql.server.protocol.PacketInput;
+import com.lealone.plugins.mysql.server.protocol.PacketInput;
 
 public interface PacketHandler {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/AuthPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/AuthPacket.java
similarity index 95%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/AuthPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/AuthPacket.java
index ef77bf352..d8dbaf66e 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/AuthPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/AuthPacket.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
-import org.lealone.plugins.mysql.server.util.Capabilities;
+import com.lealone.plugins.mysql.server.util.Capabilities;
 
 /**
  * From client to server during initial handshake.
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/EOFPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/EOFPacket.java
similarity index 97%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/EOFPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/EOFPacket.java
index c3713cbcb..c80746a46 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/EOFPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/EOFPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * From Server To Client, at the end of a series of Field Packets, and at the
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ErrorCode.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ErrorCode.java
similarity index 99%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ErrorCode.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ErrorCode.java
index 7388f9bc8..fc3c1ac2f 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ErrorCode.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ErrorCode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * @author xianmao.hexm
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ErrorPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ErrorPacket.java
similarity index 97%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ErrorPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ErrorPacket.java
index 1c9450f30..b4a7173f8 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ErrorPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ErrorPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * From server to client in response to command, if error.
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ExecutePacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ExecutePacket.java
similarity index 89%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ExecutePacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ExecutePacket.java
index d1b81b02e..7541939ee 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ExecutePacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ExecutePacket.java
@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.lealone.db.CommandParameter;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.sql.PreparedSQLStatement;
 
 /**
  * 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/FieldPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/FieldPacket.java
similarity index 98%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/FieldPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/FieldPacket.java
index f0abeadb0..cc04976d7 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/FieldPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/FieldPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * From Server To Client, part of Result Set Packets. One for each column in the
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/Fields.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/Fields.java
similarity index 96%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/Fields.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/Fields.java
index feb544973..bed14ef89 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/Fields.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/Fields.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.value.Value;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.value.Value;
 
 /**
  * 字段类型及标识定义
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/HandshakePacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/HandshakePacket.java
similarity index 91%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/HandshakePacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/HandshakePacket.java
index 25bb78ff4..d4081aff9 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/HandshakePacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/HandshakePacket.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
-import org.lealone.plugins.mysql.server.MySQLServer;
-import org.lealone.plugins.mysql.server.util.Capabilities;
-import org.lealone.plugins.mysql.server.util.CharsetUtil;
-import org.lealone.plugins.mysql.server.util.RandomUtil;
+import com.lealone.plugins.mysql.server.MySQLServer;
+import com.lealone.plugins.mysql.server.util.Capabilities;
+import com.lealone.plugins.mysql.server.util.CharsetUtil;
+import com.lealone.plugins.mysql.server.util.RandomUtil;
 
 // server发给client的第一个握手包
 // 包格式参考: https://dev.mysql.com/doc/dev/mysql-server/latest/
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/InitDbPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/InitDbPacket.java
similarity index 89%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/InitDbPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/InitDbPacket.java
index 40be46101..f07be7551 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/InitDbPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/InitDbPacket.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 public class InitDbPacket extends RequestPacket {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/OkPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/OkPacket.java
similarity index 97%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/OkPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/OkPacket.java
index d9af87d9d..73c945973 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/OkPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/OkPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * From server to client in response to command, if no error and no result set.
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/Packet.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/Packet.java
similarity index 95%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/Packet.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/Packet.java
index adba36d35..2b67b6849 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/Packet.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/Packet.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 import java.io.UnsupportedEncodingException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.plugins.mysql.server.util.CharsetUtil;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.plugins.mysql.server.util.CharsetUtil;
 
 public abstract class Packet {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketInput.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketInput.java
similarity index 96%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketInput.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketInput.java
index d2065500c..7c2e81bc2 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketInput.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketInput.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -12,9 +12,9 @@
 import java.sql.Timestamp;
 import java.util.Calendar;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.net.NetBuffer;
-import org.lealone.plugins.mysql.server.MySQLServerConnection;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.net.NetBuffer;
+import com.lealone.plugins.mysql.server.MySQLServerConnection;
 
 public class PacketInput {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketOutput.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketOutput.java
similarity index 96%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketOutput.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketOutput.java
index 417dce2e9..993c68117 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketOutput.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketOutput.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 import java.nio.ByteBuffer;
 
-import org.lealone.db.DataBuffer;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.net.WritableChannel;
+import com.lealone.db.DataBuffer;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.net.WritableChannel;
 
 public class PacketOutput {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketType.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketType.java
similarity index 98%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketType.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketType.java
index 287aae151..005bf40c0 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PacketType.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PacketType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * @author xianmao.hexm
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java
similarity index 97%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java
index 03752eda0..3e0dad5b4 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/PreparedOkPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/RequestPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/RequestPacket.java
similarity index 86%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/RequestPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/RequestPacket.java
index 5299d4e36..75fe443ad 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/RequestPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/RequestPacket.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 public abstract class RequestPacket extends Packet {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ResponsePacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ResponsePacket.java
similarity index 93%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ResponsePacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ResponsePacket.java
index 69825a019..1d502b701 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ResponsePacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ResponsePacket.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 public abstract class ResponsePacket extends Packet {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java
similarity index 97%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java
index 7c27a888e..23dd9856c 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/ResultSetHeaderPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 /**
  * From server to client after command, if no error and result set -- that is,
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/RowDataPacket.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/RowDataPacket.java
similarity index 98%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/RowDataPacket.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/RowDataPacket.java
index 7d9f6f546..975818d4b 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/protocol/RowDataPacket.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/protocol/RowDataPacket.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.protocol;
+package com.lealone.plugins.mysql.server.protocol;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/Capabilities.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/Capabilities.java
similarity index 98%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/Capabilities.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/Capabilities.java
index 15d2858d4..7cdc0db6e 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/Capabilities.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/Capabilities.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.util;
+package com.lealone.plugins.mysql.server.util;
 
 /**
  * 处理能力标识定义
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/CharsetUtil.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/CharsetUtil.java
similarity index 99%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/CharsetUtil.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/CharsetUtil.java
index f5cce9f06..b6ee3238d 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/CharsetUtil.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/CharsetUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.util;
+package com.lealone.plugins.mysql.server.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/RandomUtil.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/RandomUtil.java
similarity index 98%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/RandomUtil.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/RandomUtil.java
index 07714b332..ad5f2d260 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/RandomUtil.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/RandomUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.util;
+package com.lealone.plugins.mysql.server.util;
 
 /**
  * @author xianmao.hexm 2010-1-21 上午10:39:54
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/SecurityUtil.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/SecurityUtil.java
similarity index 97%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/SecurityUtil.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/SecurityUtil.java
index b0e412b25..3a5c69a75 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/server/util/SecurityUtil.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/server/util/SecurityUtil.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.plugins.mysql.server.util;
+package com.lealone.plugins.mysql.server.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.DbException;
 
 /**
  * 加密解密工具类
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/MySQLEngine.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/MySQLEngine.java
similarity index 69%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/MySQLEngine.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/MySQLEngine.java
index 7b9c93fc0..a59574e11 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/MySQLEngine.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/MySQLEngine.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql;
+package com.lealone.plugins.mysql.sql;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.plugins.mysql.server.MySQLServerEngine;
-import org.lealone.sql.SQLEngineBase;
-import org.lealone.sql.SQLParserBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.plugins.mysql.server.MySQLServerEngine;
+import com.lealone.sql.SQLEngineBase;
+import com.lealone.sql.SQLParserBase;
 
 public class MySQLEngine extends SQLEngineBase {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/MySQLParser.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/MySQLParser.java
similarity index 95%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/MySQLParser.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/MySQLParser.java
index 95d15714e..940fd9c37 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/MySQLParser.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/MySQLParser.java
@@ -3,37 +3,37 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql;
+package com.lealone.plugins.mysql.sql;
 
 import java.util.ArrayList;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.DbSetting;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.SessionSetting;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.plugins.mysql.sql.ddl.CreateProcedure;
-import org.lealone.plugins.mysql.sql.ddl.CreateRoutine;
-import org.lealone.plugins.mysql.sql.expression.MySQLVariable;
-import org.lealone.sql.SQLParserBase;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.ddl.AlterUser;
-import org.lealone.sql.ddl.CreateSchema;
-import org.lealone.sql.ddl.CreateTable;
-import org.lealone.sql.dml.SetDatabase;
-import org.lealone.sql.dml.SetSession;
-import org.lealone.sql.dml.SetStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.function.Function;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.DbSetting;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.SessionSetting;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.plugins.mysql.sql.ddl.CreateProcedure;
+import com.lealone.plugins.mysql.sql.ddl.CreateRoutine;
+import com.lealone.plugins.mysql.sql.expression.MySQLVariable;
+import com.lealone.sql.SQLParserBase;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.ddl.AlterUser;
+import com.lealone.sql.ddl.CreateSchema;
+import com.lealone.sql.ddl.CreateTable;
+import com.lealone.sql.dml.SetDatabase;
+import com.lealone.sql.dml.SetSession;
+import com.lealone.sql.dml.SetStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.function.Function;
 
 public class MySQLParser extends SQLParserBase {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateFunction.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateFunction.java
similarity index 79%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateFunction.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateFunction.java
index a560a237e..9171fb0dc 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateFunction.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateFunction.java
@@ -1,14 +1,14 @@
-package org.lealone.plugins.mysql.sql.ddl;
+package com.lealone.plugins.mysql.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.plugins.mysql.sql.expression.function.MySQLFunction;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.plugins.mysql.sql.expression.function.MySQLFunction;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 @SuppressWarnings("unused")
 public class CreateFunction extends CreateRoutine {
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateProcedure.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateProcedure.java
similarity index 80%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateProcedure.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateProcedure.java
index 5c4fd4adf..286847edf 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateProcedure.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateProcedure.java
@@ -1,13 +1,13 @@
-package org.lealone.plugins.mysql.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
+package com.lealone.plugins.mysql.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
 
 @SuppressWarnings("unused")
 public class CreateProcedure extends CreateRoutine {
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateRoutine.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateRoutine.java
similarity index 75%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateRoutine.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateRoutine.java
index 41b0245b1..abf217d31 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/ddl/CreateRoutine.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/ddl/CreateRoutine.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.ddl;
+package com.lealone.plugins.mysql.sql.ddl;
 
 import java.util.List;
 
-import org.lealone.common.util.Utils;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.ddl.SchemaStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.util.Utils;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.ddl.SchemaStatement;
+import com.lealone.sql.expression.Expression;
 
 public abstract class CreateRoutine extends SchemaStatement {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/MySQLVariable.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/MySQLVariable.java
similarity index 90%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/MySQLVariable.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/MySQLVariable.java
index 56a8a1e74..3ad19af74 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/MySQLVariable.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/MySQLVariable.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression;
+package com.lealone.plugins.mysql.sql.expression;
 
 import java.sql.Connection;
 import java.util.TimeZone;
 
-import org.lealone.db.Constants;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.Variable;
+import com.lealone.db.Constants;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.Variable;
 
 public class MySQLVariable extends Variable {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/BitFunction.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/BitFunction.java
similarity index 80%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/BitFunction.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/BitFunction.java
index f008d2266..f1b3451f8 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/BitFunction.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/BitFunction.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression.function;
+package com.lealone.plugins.mysql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class BitFunction extends MySQLFunction {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/InformationFunction.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/InformationFunction.java
similarity index 78%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/InformationFunction.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/InformationFunction.java
index cf8a37bed..f0a33b9c3 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/InformationFunction.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/InformationFunction.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression.function;
-
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueStringFixed;
-import org.lealone.plugins.mysql.server.MySQLServer;
-import org.lealone.sql.expression.function.FunctionInfo;
+package com.lealone.plugins.mysql.sql.expression.function;
+
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueStringFixed;
+import com.lealone.plugins.mysql.server.MySQLServer;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class InformationFunction extends MySQLFunction {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java
similarity index 81%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java
index e0bde5f0f..192ec2aa8 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/MySQLFunction.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression.function;
+package com.lealone.plugins.mysql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.sql.expression.function.BuiltInFunctionExt;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.sql.expression.function.BuiltInFunctionExt;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public abstract class MySQLFunction extends BuiltInFunctionExt {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java
similarity index 76%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java
index 2bece7268..0b5c29503 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/MySQLFunctionFactory.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression.function;
+package com.lealone.plugins.mysql.sql.expression.function;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.FunctionFactory;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.FunctionFactory;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class MySQLFunctionFactory implements FunctionFactory {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java
similarity index 89%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java
index b3afb8fa2..a834b23cf 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/PerformanceSchemaFunction.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression.function;
+package com.lealone.plugins.mysql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class PerformanceSchemaFunction extends MySQLFunction {
 
diff --git a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/UserFunction.java b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/UserFunction.java
similarity index 70%
rename from lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/UserFunction.java
rename to lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/UserFunction.java
index d9202e469..c3a0c4abc 100644
--- a/lealone-plugins/mysql/src/main/java/org/lealone/plugins/mysql/sql/expression/function/UserFunction.java
+++ b/lealone-plugins/mysql/src/main/java/com/lealone/plugins/mysql/sql/expression/function/UserFunction.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.mysql.sql.expression.function;
+package com.lealone.plugins.mysql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class UserFunction extends MySQLFunction {
 
diff --git a/lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine b/lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
new file mode 100644
index 000000000..d184f4793
--- /dev/null
+++ b/lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
@@ -0,0 +1 @@
+com.lealone.plugins.mysql.server.MySQLServerEngine
\ No newline at end of file
diff --git a/lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine b/lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine
new file mode 100644
index 000000000..4e701960d
--- /dev/null
+++ b/lealone-plugins/mysql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine
@@ -0,0 +1 @@
+com.lealone.plugins.mysql.sql.MySQLEngine
\ No newline at end of file
diff --git a/lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine b/lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
deleted file mode 100644
index 5a0a59939..000000000
--- a/lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.plugins.mysql.server.MySQLServerEngine
\ No newline at end of file
diff --git a/lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine b/lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine
deleted file mode 100644
index b1a99cf03..000000000
--- a/lealone-plugins/mysql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.plugins.mysql.sql.MySQLEngine
diff --git a/lealone-plugins/pom.xml b/lealone-plugins/pom.xml
index f287e935c..2ae928b1d 100644
--- a/lealone-plugins/pom.xml
+++ b/lealone-plugins/pom.xml
@@ -19,13 +19,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
     
 
-    org.lealone.plugins
+    com.lealone.plugins
     lealone-plugins
     pom
     6.0.0-SNAPSHOT
diff --git a/lealone-plugins/postgresql/pom.xml b/lealone-plugins/postgresql/pom.xml
index 9a030b7a6..bf6a8b30a 100644
--- a/lealone-plugins/postgresql/pom.xml
+++ b/lealone-plugins/postgresql/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone.plugins
+        com.lealone.plugins
         lealone-plugins
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-server
             ${project.version}
         
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServer.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServer.java
similarity index 86%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServer.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServer.java
index a0b9940ed..e9b57495d 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServer.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServer.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server;
+package com.lealone.plugins.postgresql.server;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -11,30 +11,30 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.ScriptReader;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.result.Result;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.net.WritableChannel;
-import org.lealone.plugins.postgresql.sql.expression.function.PgFunctionFactory;
-import org.lealone.server.AsyncServer;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.ScriptReader;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.result.Result;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.net.WritableChannel;
+import com.lealone.plugins.postgresql.sql.expression.function.PgFunctionFactory;
+import com.lealone.server.AsyncServer;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
 
 public class PgServer extends AsyncServer {
 
     private static final Logger logger = LoggerFactory.getLogger(PgServer.class);
 
     public static final String PG_VERSION = "8.2.23";
-    public static final String PG_CATALOG_FILE = "/org/lealone/plugins/postgresql/resources/pg_catalog.sql";
+    public static final String PG_CATALOG_FILE = "/com/lealone/plugins/postgresql/resources/pg_catalog.sql";
     public static final int DEFAULT_PORT = 5432;
 
     private final HashSet typeSet = new HashSet<>();
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServerConnection.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServerConnection.java
similarity index 85%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServerConnection.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServerConnection.java
index cbbcecae8..59508cc00 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServerConnection.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServerConnection.java
@@ -3,27 +3,27 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server;
+package com.lealone.plugins.postgresql.server;
 
 import java.nio.ByteBuffer;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.PluginManager;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.ServerSession;
-import org.lealone.net.NetBuffer;
-import org.lealone.net.WritableChannel;
-import org.lealone.plugins.postgresql.server.handler.AuthPacketHandler;
-import org.lealone.plugins.postgresql.server.handler.CommandPacketHandler;
-import org.lealone.plugins.postgresql.server.handler.PacketHandler;
-import org.lealone.plugins.postgresql.sql.PgAlias;
-import org.lealone.server.AsyncServerConnection;
-import org.lealone.server.scheduler.SessionInfo;
-import org.lealone.sql.SQLEngine;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.PluginManager;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.ServerSession;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.WritableChannel;
+import com.lealone.plugins.postgresql.server.handler.AuthPacketHandler;
+import com.lealone.plugins.postgresql.server.handler.CommandPacketHandler;
+import com.lealone.plugins.postgresql.server.handler.PacketHandler;
+import com.lealone.plugins.postgresql.sql.PgAlias;
+import com.lealone.server.AsyncServerConnection;
+import com.lealone.server.scheduler.SessionInfo;
+import com.lealone.sql.SQLEngine;
 
 public class PgServerConnection extends AsyncServerConnection {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServerEngine.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServerEngine.java
similarity index 74%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServerEngine.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServerEngine.java
index 95b1bafe0..b95f1563d 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgServerEngine.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgServerEngine.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server;
+package com.lealone.plugins.postgresql.server;
 
-import org.lealone.server.ProtocolServer;
-import org.lealone.server.ProtocolServerEngineBase;
+import com.lealone.server.ProtocolServer;
+import com.lealone.server.ProtocolServerEngineBase;
 
 public class PgServerEngine extends ProtocolServerEngineBase {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgTask.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgTask.java
similarity index 77%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgTask.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgTask.java
index f6c366fe9..de4a61b78 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgTask.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgTask.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server;
+package com.lealone.plugins.postgresql.server;
 
-import org.lealone.net.NetBuffer;
-import org.lealone.server.scheduler.LinkableTask;
+import com.lealone.net.NetBuffer;
+import com.lealone.server.scheduler.LinkableTask;
 
 public class PgTask extends LinkableTask {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgType.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgType.java
similarity index 97%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgType.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgType.java
index 3a9d43c86..f790c1bf3 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/PgType.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/PgType.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server;
+package com.lealone.plugins.postgresql.server;
 
 import java.sql.Types;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 public class PgType {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java
similarity index 96%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java
index 8c9ea63df..b3763a184 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/AuthPacketHandler.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server.handler;
+package com.lealone.plugins.postgresql.server.handler;
 
 import java.io.IOException;
 
-import org.lealone.plugins.postgresql.server.PgServer;
-import org.lealone.plugins.postgresql.server.PgServerConnection;
+import com.lealone.plugins.postgresql.server.PgServer;
+import com.lealone.plugins.postgresql.server.PgServerConnection;
 
 // 官方协议文档: https://www.postgresql.org/docs/15/protocol-message-formats.html
 public class AuthPacketHandler extends PacketHandler {
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java
similarity index 95%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java
index f223b9c4c..5fe3b6d36 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/CommandPacketHandler.java
@@ -3,30 +3,30 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server.handler;
+package com.lealone.plugins.postgresql.server.handler;
 
 import java.io.IOException;
 import java.io.StringReader;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.ScriptReader;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Database;
-import org.lealone.db.result.Result;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.plugins.postgresql.server.PgServer;
-import org.lealone.plugins.postgresql.server.PgServerConnection;
-import org.lealone.plugins.postgresql.server.PgType;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.ScriptReader;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Database;
+import com.lealone.db.result.Result;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.plugins.postgresql.server.PgServer;
+import com.lealone.plugins.postgresql.server.PgServerConnection;
+import com.lealone.plugins.postgresql.server.PgType;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
 
 // 官方协议文档: https://www.postgresql.org/docs/15/protocol-message-formats.html
 public class CommandPacketHandler extends PacketHandler {
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/PacketHandler.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/PacketHandler.java
similarity index 88%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/PacketHandler.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/PacketHandler.java
index 22e217e04..7dadc92fb 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/handler/PacketHandler.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/handler/PacketHandler.java
@@ -3,24 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server.handler;
+package com.lealone.plugins.postgresql.server.handler;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.Utils;
-import org.lealone.db.session.ServerSession;
-import org.lealone.net.NetBuffer;
-import org.lealone.plugins.postgresql.server.PgServer;
-import org.lealone.plugins.postgresql.server.PgServerConnection;
-import org.lealone.plugins.postgresql.server.io.NetBufferInput;
-import org.lealone.plugins.postgresql.server.io.NetBufferOutput;
-import org.lealone.server.scheduler.SessionInfo;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.Utils;
+import com.lealone.db.session.ServerSession;
+import com.lealone.net.NetBuffer;
+import com.lealone.plugins.postgresql.server.PgServer;
+import com.lealone.plugins.postgresql.server.PgServerConnection;
+import com.lealone.plugins.postgresql.server.io.NetBufferInput;
+import com.lealone.plugins.postgresql.server.io.NetBufferOutput;
+import com.lealone.server.scheduler.SessionInfo;
 
 public abstract class PacketHandler {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/io/NetBufferInput.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/io/NetBufferInput.java
similarity index 94%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/io/NetBufferInput.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/io/NetBufferInput.java
index 3a7b555f9..7c3b95990 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/io/NetBufferInput.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/io/NetBufferInput.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server.io;
+package com.lealone.plugins.postgresql.server.io;
 
-import org.lealone.net.NetBuffer;
+import com.lealone.net.NetBuffer;
 
 public class NetBufferInput implements AutoCloseable {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/io/NetBufferOutput.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/io/NetBufferOutput.java
similarity index 93%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/io/NetBufferOutput.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/io/NetBufferOutput.java
index 70f29825d..e585aa303 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/server/io/NetBufferOutput.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/server/io/NetBufferOutput.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.server.io;
+package com.lealone.plugins.postgresql.server.io;
 
-import org.lealone.db.DataBufferFactory;
-import org.lealone.net.NetBuffer;
-import org.lealone.net.WritableChannel;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.net.NetBuffer;
+import com.lealone.net.WritableChannel;
 
 public class NetBufferOutput implements AutoCloseable {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgAlias.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgAlias.java
similarity index 97%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgAlias.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgAlias.java
index 6178e357f..0ad441689 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgAlias.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgAlias.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql;
+package com.lealone.plugins.postgresql.sql;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -12,9 +12,9 @@
 import java.sql.Timestamp;
 import java.sql.Types;
 
-import org.lealone.db.Constants;
-import org.lealone.plugins.postgresql.server.PgServer;
-import org.lealone.plugins.postgresql.server.PgType;
+import com.lealone.db.Constants;
+import com.lealone.plugins.postgresql.server.PgServer;
+import com.lealone.plugins.postgresql.server.PgType;
 
 /**
  * This class implements a subset of the PostgreSQL protocol as described here:
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgSQLEngine.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgSQLEngine.java
similarity index 72%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgSQLEngine.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgSQLEngine.java
index f568d2b56..03a648650 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgSQLEngine.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgSQLEngine.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql;
+package com.lealone.plugins.postgresql.sql;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.plugins.postgresql.server.PgServerEngine;
-import org.lealone.sql.SQLEngineBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.plugins.postgresql.server.PgServerEngine;
+import com.lealone.sql.SQLEngineBase;
 
 public class PgSQLEngine extends SQLEngineBase {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgSQLParser.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgSQLParser.java
similarity index 94%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgSQLParser.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgSQLParser.java
index 863183225..dba834095 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/PgSQLParser.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/PgSQLParser.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql;
+package com.lealone.plugins.postgresql.sql;
 
 import java.util.ArrayList;
 
-import org.lealone.common.util.Utils;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.SessionSetting;
-import org.lealone.plugins.postgresql.sql.expression.PgVariable;
-import org.lealone.sql.SQLParserBase;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.dml.SetSession;
-import org.lealone.sql.dml.TransactionStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.util.Utils;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.SessionSetting;
+import com.lealone.plugins.postgresql.sql.expression.PgVariable;
+import com.lealone.sql.SQLParserBase;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.dml.SetSession;
+import com.lealone.sql.dml.TransactionStatement;
+import com.lealone.sql.expression.Expression;
 
 public class PgSQLParser extends SQLParserBase {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/PgVariable.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/PgVariable.java
similarity index 67%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/PgVariable.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/PgVariable.java
index 244410130..74d84c17f 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/PgVariable.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/PgVariable.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql.expression;
+package com.lealone.plugins.postgresql.sql.expression;
 
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.Variable;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.Variable;
 
 public class PgVariable extends Variable {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/PgFunction.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/PgFunction.java
similarity index 76%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/PgFunction.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/PgFunction.java
index a7f6585d2..0884e0fa5 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/PgFunction.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/PgFunction.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql.expression.function;
+package com.lealone.plugins.postgresql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.sql.expression.function.BuiltInFunctionExt;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.sql.expression.function.BuiltInFunctionExt;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public abstract class PgFunction extends BuiltInFunctionExt {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java
similarity index 70%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java
index 1085588f3..6107cef73 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/PgFunctionFactory.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql.expression.function;
+package com.lealone.plugins.postgresql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.FunctionFactory;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.FunctionFactory;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class PgFunctionFactory implements FunctionFactory {
 
diff --git a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java
similarity index 77%
rename from lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java
rename to lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java
index 4b18c3ca0..31fdd369c 100644
--- a/lealone-plugins/postgresql/src/main/java/org/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java
+++ b/lealone-plugins/postgresql/src/main/java/com/lealone/plugins/postgresql/sql/expression/function/SystemCatalogInformationFunction.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.plugins.postgresql.sql.expression.function;
+package com.lealone.plugins.postgresql.sql.expression.function;
 
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueStringFixed;
-import org.lealone.plugins.postgresql.sql.PgAlias;
-import org.lealone.sql.expression.function.FunctionInfo;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueStringFixed;
+import com.lealone.plugins.postgresql.sql.PgAlias;
+import com.lealone.sql.expression.function.FunctionInfo;
 
 public class SystemCatalogInformationFunction extends PgFunction {
 
diff --git a/lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine b/lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
new file mode 100644
index 000000000..913c753de
--- /dev/null
+++ b/lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
@@ -0,0 +1 @@
+com.lealone.plugins.postgresql.server.PgServerEngine
\ No newline at end of file
diff --git a/lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine b/lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine
new file mode 100644
index 000000000..667809c6c
--- /dev/null
+++ b/lealone-plugins/postgresql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine
@@ -0,0 +1 @@
+com.lealone.plugins.postgresql.sql.PgSQLEngine
\ No newline at end of file
diff --git a/lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine b/lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
deleted file mode 100644
index b84de9d6d..000000000
--- a/lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.plugins.postgresql.server.PgServerEngine
diff --git a/lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine b/lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine
deleted file mode 100644
index 03a5811a1..000000000
--- a/lealone-plugins/postgresql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.plugins.postgresql.sql.PgSQLEngine
diff --git a/lealone-plugins/postgresql/src/main/resources/org/lealone/plugins/postgresql/resources/pg_catalog.sql b/lealone-plugins/postgresql/src/main/resources/com/lealone/plugins/postgresql/resources/pg_catalog.sql
similarity index 92%
rename from lealone-plugins/postgresql/src/main/resources/org/lealone/plugins/postgresql/resources/pg_catalog.sql
rename to lealone-plugins/postgresql/src/main/resources/com/lealone/plugins/postgresql/resources/pg_catalog.sql
index 9de5d2358..48d9fe976 100644
--- a/lealone-plugins/postgresql/src/main/resources/org/lealone/plugins/postgresql/resources/pg_catalog.sql
+++ b/lealone-plugins/postgresql/src/main/resources/com/lealone/plugins/postgresql/resources/pg_catalog.sql
@@ -8,10 +8,10 @@ drop schema if exists pg_catalog;
 create schema pg_catalog;
 
 drop alias if exists pg_convertType;
-create alias pg_convertType deterministic for "org.lealone.plugins.postgresql.sql.PgAlias.convertType";
+create alias pg_convertType deterministic for "com.lealone.plugins.postgresql.sql.PgAlias.convertType";
 
 drop alias if exists pg_get_oid;
-create alias pg_get_oid deterministic for "org.lealone.plugins.postgresql.sql.PgAlias.getOid";
+create alias pg_get_oid deterministic for "com.lealone.plugins.postgresql.sql.PgAlias.getOid";
 
 create table pg_catalog.pg_version as select 2 as version, 2 as version_read;
 --create table pg_catalog.pg_version(version int, version_read int);
@@ -210,34 +210,34 @@ and 1=0;
 grant select on pg_catalog.pg_index to public;
 
 drop alias if exists pg_get_indexdef;
-create alias pg_get_indexdef for "org.lealone.plugins.postgresql.sql.PgAlias.getIndexColumn";
+create alias pg_get_indexdef for "com.lealone.plugins.postgresql.sql.PgAlias.getIndexColumn";
 
 drop alias if exists current_schema;
-create alias current_schema for "org.lealone.plugins.postgresql.sql.PgAlias.getCurrentSchema";
+create alias current_schema for "com.lealone.plugins.postgresql.sql.PgAlias.getCurrentSchema";
 
 drop alias if exists pg_encoding_to_char;
-create alias pg_encoding_to_char for "org.lealone.plugins.postgresql.sql.PgAlias.getEncodingName";
+create alias pg_encoding_to_char for "com.lealone.plugins.postgresql.sql.PgAlias.getEncodingName";
 
 drop alias if exists pg_char_to_encoding;
-create alias pg_char_to_encoding for "org.lealone.plugins.postgresql.sql.PgAlias.getEncodingCode";
+create alias pg_char_to_encoding for "com.lealone.plugins.postgresql.sql.PgAlias.getEncodingCode";
 
 drop alias if exists format_type;
-create alias format_type for "org.lealone.plugins.postgresql.sql.PgAlias.formatType";
+create alias format_type for "com.lealone.plugins.postgresql.sql.PgAlias.formatType";
 
 drop alias if exists pg_postmaster_start_time;
-create alias pg_postmaster_start_time for "org.lealone.plugins.postgresql.sql.PgAlias.getStartTime";
+create alias pg_postmaster_start_time for "com.lealone.plugins.postgresql.sql.PgAlias.getStartTime";
 
 drop alias if exists pg_get_userbyid;
-create alias pg_get_userbyid for "org.lealone.plugins.postgresql.sql.PgAlias.getUserById";
+create alias pg_get_userbyid for "com.lealone.plugins.postgresql.sql.PgAlias.getUserById";
 
 drop alias if exists has_database_privilege;
-create alias has_database_privilege for "org.lealone.plugins.postgresql.sql.PgAlias.hasDatabasePrivilege";
+create alias has_database_privilege for "com.lealone.plugins.postgresql.sql.PgAlias.hasDatabasePrivilege";
 
 drop alias if exists has_table_privilege;
-create alias has_table_privilege for "org.lealone.plugins.postgresql.sql.PgAlias.hasTablePrivilege";
+create alias has_table_privilege for "com.lealone.plugins.postgresql.sql.PgAlias.hasTablePrivilege";
 
 drop alias if exists currtid2;
-create alias currtid2 for "org.lealone.plugins.postgresql.sql.PgAlias.getCurrentTid";
+create alias currtid2 for "com.lealone.plugins.postgresql.sql.PgAlias.getCurrentTid";
 
 create table pg_catalog.pg_database(
     oid int,
diff --git a/lealone-sci/pom.xml b/lealone-sci/pom.xml
index 06d9cd496..fed421134 100644
--- a/lealone-sci/pom.xml
+++ b/lealone-sci/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -20,7 +20,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-common
             ${project.version}
         
diff --git a/lealone-sci/src/main/java/org/lealone/db/lock/Lock.java b/lealone-sci/src/main/java/com/lealone/db/lock/Lock.java
similarity index 95%
rename from lealone-sci/src/main/java/org/lealone/db/lock/Lock.java
rename to lealone-sci/src/main/java/com/lealone/db/lock/Lock.java
index 59546f5a9..dbd9a8793 100644
--- a/lealone-sci/src/main/java/org/lealone/db/lock/Lock.java
+++ b/lealone-sci/src/main/java/com/lealone/db/lock/Lock.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.lock;
+package com.lealone.db.lock;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.lealone.db.session.Session;
-import org.lealone.transaction.Transaction;
+import com.lealone.db.session.Session;
+import com.lealone.transaction.Transaction;
 
 public abstract class Lock {
 
diff --git a/lealone-sci/src/main/java/org/lealone/db/lock/LockOwner.java b/lealone-sci/src/main/java/com/lealone/db/lock/LockOwner.java
similarity index 85%
rename from lealone-sci/src/main/java/org/lealone/db/lock/LockOwner.java
rename to lealone-sci/src/main/java/com/lealone/db/lock/LockOwner.java
index 225113584..dc6cc88ae 100644
--- a/lealone-sci/src/main/java/org/lealone/db/lock/LockOwner.java
+++ b/lealone-sci/src/main/java/com/lealone/db/lock/LockOwner.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.lock;
+package com.lealone.db.lock;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.lealone.db.session.Session;
-import org.lealone.transaction.Transaction;
+import com.lealone.db.session.Session;
+import com.lealone.transaction.Transaction;
 
 // 只有一个线程修改
 public abstract class LockOwner {
diff --git a/lealone-sci/src/main/java/org/lealone/db/lock/NullLockOwner.java b/lealone-sci/src/main/java/com/lealone/db/lock/NullLockOwner.java
similarity index 85%
rename from lealone-sci/src/main/java/org/lealone/db/lock/NullLockOwner.java
rename to lealone-sci/src/main/java/com/lealone/db/lock/NullLockOwner.java
index 4dbf95fff..1a6253ada 100644
--- a/lealone-sci/src/main/java/org/lealone/db/lock/NullLockOwner.java
+++ b/lealone-sci/src/main/java/com/lealone/db/lock/NullLockOwner.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.lock;
+package com.lealone.db.lock;
 
 public class NullLockOwner extends LockOwner {
 }
diff --git a/lealone-sci/src/main/java/org/lealone/db/lock/SimpleLockOwner.java b/lealone-sci/src/main/java/com/lealone/db/lock/SimpleLockOwner.java
similarity index 86%
rename from lealone-sci/src/main/java/org/lealone/db/lock/SimpleLockOwner.java
rename to lealone-sci/src/main/java/com/lealone/db/lock/SimpleLockOwner.java
index cef78052b..8fa982c5e 100644
--- a/lealone-sci/src/main/java/org/lealone/db/lock/SimpleLockOwner.java
+++ b/lealone-sci/src/main/java/com/lealone/db/lock/SimpleLockOwner.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.db.lock;
+package com.lealone.db.lock;
 
-import org.lealone.transaction.Transaction;
+import com.lealone.transaction.Transaction;
 
 // 单机模式，只保存transaction
 public class SimpleLockOwner extends LockOwner {
diff --git a/lealone-server/pom.xml b/lealone-server/pom.xml
index f12a51aa9..d935c2076 100644
--- a/lealone-server/pom.xml
+++ b/lealone-server/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,12 +19,12 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-net
             ${project.version}
         
         
-            org.lealone
+            com.lealone
             lealone-sql
             ${project.version}
         
diff --git a/lealone-server/src/main/java/org/lealone/server/AsyncServer.java b/lealone-server/src/main/java/com/lealone/server/AsyncServer.java
similarity index 89%
rename from lealone-server/src/main/java/org/lealone/server/AsyncServer.java
rename to lealone-server/src/main/java/com/lealone/server/AsyncServer.java
index 3e4291e11..91068eb54 100644
--- a/lealone-server/src/main/java/org/lealone/server/AsyncServer.java
+++ b/lealone-server/src/main/java/com/lealone/server/AsyncServer.java
@@ -3,24 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.nio.channels.ServerSocketChannel;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.scheduler.SchedulerFactory;
-import org.lealone.net.AsyncConnection;
-import org.lealone.net.AsyncConnectionManager;
-import org.lealone.net.NetEventLoop;
-import org.lealone.net.NetFactory;
-import org.lealone.net.NetFactoryManager;
-import org.lealone.net.NetServer;
-import org.lealone.net.WritableChannel;
-import org.lealone.server.scheduler.GlobalScheduler;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.scheduler.SchedulerFactory;
+import com.lealone.net.AsyncConnection;
+import com.lealone.net.AsyncConnectionManager;
+import com.lealone.net.NetEventLoop;
+import com.lealone.net.NetFactory;
+import com.lealone.net.NetFactoryManager;
+import com.lealone.net.NetServer;
+import com.lealone.net.WritableChannel;
+import com.lealone.server.scheduler.GlobalScheduler;
 
 public abstract class AsyncServer extends DelegatedProtocolServer
         implements AsyncConnectionManager {
diff --git a/lealone-server/src/main/java/org/lealone/server/AsyncServerConnection.java b/lealone-server/src/main/java/com/lealone/server/AsyncServerConnection.java
similarity index 73%
rename from lealone-server/src/main/java/org/lealone/server/AsyncServerConnection.java
rename to lealone-server/src/main/java/com/lealone/server/AsyncServerConnection.java
index f3f9ed1d3..b02832847 100644
--- a/lealone-server/src/main/java/org/lealone/server/AsyncServerConnection.java
+++ b/lealone-server/src/main/java/com/lealone/server/AsyncServerConnection.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
-import org.lealone.net.TransferConnection;
-import org.lealone.net.WritableChannel;
-import org.lealone.server.scheduler.SessionInfo;
+import com.lealone.net.TransferConnection;
+import com.lealone.net.WritableChannel;
+import com.lealone.server.scheduler.SessionInfo;
 
 public abstract class AsyncServerConnection extends TransferConnection {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/AsyncServerManager.java b/lealone-server/src/main/java/com/lealone/server/AsyncServerManager.java
similarity index 97%
rename from lealone-server/src/main/java/org/lealone/server/AsyncServerManager.java
rename to lealone-server/src/main/java/com/lealone/server/AsyncServerManager.java
index f5eedb415..d99632fce 100644
--- a/lealone-server/src/main/java/org/lealone/server/AsyncServerManager.java
+++ b/lealone-server/src/main/java/com/lealone/server/AsyncServerManager.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.ServerSocketChannel;
 import java.util.ArrayList;
 
-import org.lealone.common.util.BitField;
-import org.lealone.db.scheduler.Scheduler;
+import com.lealone.common.util.BitField;
+import com.lealone.db.scheduler.Scheduler;
 
 public class AsyncServerManager {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/TcpServer.java b/lealone-server/src/main/java/com/lealone/server/TcpServer.java
similarity index 81%
rename from lealone-server/src/main/java/org/lealone/server/TcpServer.java
rename to lealone-server/src/main/java/com/lealone/server/TcpServer.java
index ccae5af0b..6c7d017d5 100644
--- a/lealone-server/src/main/java/org/lealone/server/TcpServer.java
+++ b/lealone-server/src/main/java/com/lealone/server/TcpServer.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.util.Map;
 
-import org.lealone.db.Constants;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.net.NetNode;
-import org.lealone.net.WritableChannel;
+import com.lealone.db.Constants;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.net.NetNode;
+import com.lealone.net.WritableChannel;
 
 public class TcpServer extends AsyncServer {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/TcpServerConnection.java b/lealone-server/src/main/java/com/lealone/server/TcpServerConnection.java
similarity index 90%
rename from lealone-server/src/main/java/org/lealone/server/TcpServerConnection.java
rename to lealone-server/src/main/java/com/lealone/server/TcpServerConnection.java
index 7fb234985..640017bec 100644
--- a/lealone-server/src/main/java/org/lealone/server/TcpServerConnection.java
+++ b/lealone-server/src/main/java/com/lealone/server/TcpServerConnection.java
@@ -3,30 +3,30 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 import java.io.IOException;
 import java.util.HashMap;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.util.ExpiringMap;
-import org.lealone.db.DataBufferFactory;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.net.TransferInputStream;
-import org.lealone.net.TransferOutputStream;
-import org.lealone.net.WritableChannel;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.session.SessionInit;
-import org.lealone.server.protocol.session.SessionInitAck;
-import org.lealone.server.scheduler.PacketHandleTask;
-import org.lealone.server.scheduler.SessionInfo;
-import org.lealone.server.scheduler.SessionInitTask;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.util.ExpiringMap;
+import com.lealone.db.DataBufferFactory;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.net.TransferInputStream;
+import com.lealone.net.TransferOutputStream;
+import com.lealone.net.WritableChannel;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.session.SessionInit;
+import com.lealone.server.protocol.session.SessionInitAck;
+import com.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.server.scheduler.SessionInfo;
+import com.lealone.server.scheduler.SessionInitTask;
 
 /**
  * 这里只处理客户端通过TCP连到服务器端后的协议，可以在一个TCP连接中打开多个session
diff --git a/lealone-server/src/main/java/org/lealone/server/TcpServerEngine.java b/lealone-server/src/main/java/com/lealone/server/TcpServerEngine.java
similarity index 93%
rename from lealone-server/src/main/java/org/lealone/server/TcpServerEngine.java
rename to lealone-server/src/main/java/com/lealone/server/TcpServerEngine.java
index 2a655d1ba..ea55f54e2 100644
--- a/lealone-server/src/main/java/org/lealone/server/TcpServerEngine.java
+++ b/lealone-server/src/main/java/com/lealone/server/TcpServerEngine.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server;
+package com.lealone.server;
 
 public class TcpServerEngine extends ProtocolServerEngineBase {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/BatchStatementPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/BatchStatementPacketHandlers.java
similarity index 87%
rename from lealone-server/src/main/java/org/lealone/server/handler/BatchStatementPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/BatchStatementPacketHandlers.java
index e2e7d9502..53aab26d1 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/BatchStatementPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/BatchStatementPacketHandlers.java
@@ -3,23 +3,23 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
 import java.sql.Statement;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.db.CommandParameter;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.batch.BatchStatementPreparedUpdate;
-import org.lealone.server.protocol.batch.BatchStatementUpdate;
-import org.lealone.server.protocol.batch.BatchStatementUpdateAck;
-import org.lealone.server.scheduler.LinkableTask;
-import org.lealone.server.scheduler.PacketHandleTask;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.batch.BatchStatementPreparedUpdate;
+import com.lealone.server.protocol.batch.BatchStatementUpdate;
+import com.lealone.server.protocol.batch.BatchStatementUpdateAck;
+import com.lealone.server.scheduler.LinkableTask;
+import com.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.sql.PreparedSQLStatement;
 
 //先把批量语句转成AsyncTask再按先后顺序一个个处理
 class BatchStatementPacketHandlers extends PacketHandlers {
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/LobPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/LobPacketHandlers.java
similarity index 86%
rename from lealone-server/src/main/java/org/lealone/server/handler/LobPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/LobPacketHandlers.java
index 59bb4c52c..e9da20e74 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/LobPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/LobPacketHandlers.java
@@ -3,26 +3,26 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
 import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.SmallLRUCache;
-import org.lealone.db.Constants;
-import org.lealone.db.DataHandler;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLob;
-import org.lealone.net.TransferOutputStream;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.lob.LobRead;
-import org.lealone.server.protocol.lob.LobReadAck;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.SmallLRUCache;
+import com.lealone.db.Constants;
+import com.lealone.db.DataHandler;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLob;
+import com.lealone.net.TransferOutputStream;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.lob.LobRead;
+import com.lealone.server.protocol.lob.LobReadAck;
 
 public class LobPacketHandlers extends PacketHandlers {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/PacketHandler.java b/lealone-server/src/main/java/com/lealone/server/handler/PacketHandler.java
similarity index 68%
rename from lealone-server/src/main/java/org/lealone/server/handler/PacketHandler.java
rename to lealone-server/src/main/java/com/lealone/server/handler/PacketHandler.java
index 82e238c90..e22097cb6 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/PacketHandler.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/PacketHandler.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.scheduler.PacketHandleTask;
 
 public interface PacketHandler
 {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/PacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/PacketHandlers.java
similarity index 88%
rename from lealone-server/src/main/java/org/lealone/server/handler/PacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/PacketHandlers.java
index 427dbc890..a4f21c42b 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/PacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/PacketHandlers.java
@@ -3,25 +3,25 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
 import java.util.List;
 
-import org.lealone.db.CommandParameter;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.Value;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.QueryPacket;
-import org.lealone.server.protocol.ps.PreparedStatementQuery;
-import org.lealone.server.protocol.ps.PreparedStatementUpdate;
-import org.lealone.server.protocol.statement.StatementQuery;
-import org.lealone.server.protocol.statement.StatementQueryAck;
-import org.lealone.server.protocol.statement.StatementUpdate;
-import org.lealone.server.protocol.statement.StatementUpdateAck;
-import org.lealone.server.scheduler.PacketHandleTask;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.StatementList;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.Value;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.QueryPacket;
+import com.lealone.server.protocol.ps.PreparedStatementQuery;
+import com.lealone.server.protocol.ps.PreparedStatementUpdate;
+import com.lealone.server.protocol.statement.StatementQuery;
+import com.lealone.server.protocol.statement.StatementQueryAck;
+import com.lealone.server.protocol.statement.StatementUpdate;
+import com.lealone.server.protocol.statement.StatementUpdateAck;
+import com.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.StatementList;
 
 @SuppressWarnings("rawtypes")
 public class PacketHandlers {
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/PreparedStatementPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/PreparedStatementPacketHandlers.java
similarity index 78%
rename from lealone-server/src/main/java/org/lealone/server/handler/PreparedStatementPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/PreparedStatementPacketHandlers.java
index 592d6eaf6..01aa205ee 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/PreparedStatementPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/PreparedStatementPacketHandlers.java
@@ -3,23 +3,23 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.ps.PreparedStatementClose;
-import org.lealone.server.protocol.ps.PreparedStatementGetMetaData;
-import org.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck;
-import org.lealone.server.protocol.ps.PreparedStatementPrepare;
-import org.lealone.server.protocol.ps.PreparedStatementPrepareAck;
-import org.lealone.server.protocol.ps.PreparedStatementPrepareReadParams;
-import org.lealone.server.protocol.ps.PreparedStatementPrepareReadParamsAck;
-import org.lealone.server.protocol.ps.PreparedStatementQuery;
-import org.lealone.server.protocol.ps.PreparedStatementUpdate;
-import org.lealone.server.scheduler.PacketHandleTask;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.ps.PreparedStatementClose;
+import com.lealone.server.protocol.ps.PreparedStatementGetMetaData;
+import com.lealone.server.protocol.ps.PreparedStatementGetMetaDataAck;
+import com.lealone.server.protocol.ps.PreparedStatementPrepare;
+import com.lealone.server.protocol.ps.PreparedStatementPrepareAck;
+import com.lealone.server.protocol.ps.PreparedStatementPrepareReadParams;
+import com.lealone.server.protocol.ps.PreparedStatementPrepareReadParamsAck;
+import com.lealone.server.protocol.ps.PreparedStatementQuery;
+import com.lealone.server.protocol.ps.PreparedStatementUpdate;
+import com.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.sql.PreparedSQLStatement;
 
 class PreparedStatementPacketHandlers extends PacketHandlers {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/ResultPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/ResultPacketHandlers.java
similarity index 77%
rename from lealone-server/src/main/java/org/lealone/server/handler/ResultPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/ResultPacketHandlers.java
index b6589cfa2..5cd1fa238 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/ResultPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/ResultPacketHandlers.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
-import org.lealone.db.ManualCloseable;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.result.ResultChangeId;
-import org.lealone.server.protocol.result.ResultClose;
-import org.lealone.server.protocol.result.ResultFetchRows;
-import org.lealone.server.protocol.result.ResultFetchRowsAck;
-import org.lealone.server.protocol.result.ResultReset;
+import com.lealone.db.ManualCloseable;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.result.ResultChangeId;
+import com.lealone.server.protocol.result.ResultClose;
+import com.lealone.server.protocol.result.ResultFetchRows;
+import com.lealone.server.protocol.result.ResultFetchRowsAck;
+import com.lealone.server.protocol.result.ResultReset;
 
 class ResultPacketHandlers extends PacketHandlers {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/SessionPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/SessionPacketHandlers.java
similarity index 77%
rename from lealone-server/src/main/java/org/lealone/server/handler/SessionPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/SessionPacketHandlers.java
index e39d87b2e..653c851f6 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/SessionPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/SessionPacketHandlers.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.session.SessionCancelStatement;
-import org.lealone.server.protocol.session.SessionClose;
-import org.lealone.server.protocol.session.SessionSetAutoCommit;
-import org.lealone.server.scheduler.PacketHandleTask;
-import org.lealone.sql.PreparedSQLStatement;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.session.SessionCancelStatement;
+import com.lealone.server.protocol.session.SessionClose;
+import com.lealone.server.protocol.session.SessionSetAutoCommit;
+import com.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.sql.PreparedSQLStatement;
 
 class SessionPacketHandlers extends PacketHandlers {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/StatementListPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/StatementListPacketHandlers.java
similarity index 91%
rename from lealone-server/src/main/java/org/lealone/server/handler/StatementListPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/StatementListPacketHandlers.java
index c41ecd4f2..eb50bca05 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/StatementListPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/StatementListPacketHandlers.java
@@ -3,22 +3,22 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.result.Result;
-import org.lealone.server.handler.PacketHandlers.QueryPacketHandler;
-import org.lealone.server.handler.PacketHandlers.UpdatePacketHandler;
-import org.lealone.server.protocol.QueryPacket;
-import org.lealone.server.protocol.statement.StatementQuery;
-import org.lealone.server.protocol.statement.StatementUpdate;
-import org.lealone.server.scheduler.LinkableTask;
-import org.lealone.server.scheduler.PacketHandleTask;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.StatementList;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.result.Result;
+import com.lealone.server.handler.PacketHandlers.QueryPacketHandler;
+import com.lealone.server.handler.PacketHandlers.UpdatePacketHandler;
+import com.lealone.server.protocol.QueryPacket;
+import com.lealone.server.protocol.statement.StatementQuery;
+import com.lealone.server.protocol.statement.StatementUpdate;
+import com.lealone.server.scheduler.LinkableTask;
+import com.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.StatementList;
 
 // 用异步的方式执行StatementList
 class StatementListPacketHandlers {
diff --git a/lealone-server/src/main/java/org/lealone/server/handler/StatementPacketHandlers.java b/lealone-server/src/main/java/com/lealone/server/handler/StatementPacketHandlers.java
similarity index 73%
rename from lealone-server/src/main/java/org/lealone/server/handler/StatementPacketHandlers.java
rename to lealone-server/src/main/java/com/lealone/server/handler/StatementPacketHandlers.java
index 53bad4fd6..64888347c 100644
--- a/lealone-server/src/main/java/org/lealone/server/handler/StatementPacketHandlers.java
+++ b/lealone-server/src/main/java/com/lealone/server/handler/StatementPacketHandlers.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.handler;
+package com.lealone.server.handler;
 
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketType;
-import org.lealone.server.protocol.statement.StatementQuery;
-import org.lealone.server.protocol.statement.StatementUpdate;
-import org.lealone.server.scheduler.PacketHandleTask;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketType;
+import com.lealone.server.protocol.statement.StatementQuery;
+import com.lealone.server.protocol.statement.StatementUpdate;
+import com.lealone.server.scheduler.PacketHandleTask;
 
 public class StatementPacketHandlers extends PacketHandlers {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/scheduler/GlobalScheduler.java b/lealone-server/src/main/java/com/lealone/server/scheduler/GlobalScheduler.java
similarity index 94%
rename from lealone-server/src/main/java/org/lealone/server/scheduler/GlobalScheduler.java
rename to lealone-server/src/main/java/com/lealone/server/scheduler/GlobalScheduler.java
index 5df5af85b..b71114fca 100644
--- a/lealone-server/src/main/java/org/lealone/server/scheduler/GlobalScheduler.java
+++ b/lealone-server/src/main/java/com/lealone/server/scheduler/GlobalScheduler.java
@@ -3,30 +3,30 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.scheduler;
+package com.lealone.server.scheduler;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.ServerSocketChannel;
 import java.util.Map;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.MemoryManager;
-import org.lealone.db.async.AsyncTask;
-import org.lealone.db.link.LinkableBase;
-import org.lealone.db.link.LinkableList;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.net.NetScheduler;
-import org.lealone.server.AsyncServer;
-import org.lealone.server.AsyncServerManager;
-import org.lealone.server.ProtocolServer;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
-import org.lealone.storage.page.PageOperation;
-import org.lealone.storage.page.PageOperation.PageOperationResult;
-import org.lealone.transaction.TransactionEngine;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.MemoryManager;
+import com.lealone.db.async.AsyncTask;
+import com.lealone.db.link.LinkableBase;
+import com.lealone.db.link.LinkableList;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.net.NetScheduler;
+import com.lealone.server.AsyncServer;
+import com.lealone.server.AsyncServerManager;
+import com.lealone.server.ProtocolServer;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
+import com.lealone.storage.page.PageOperation;
+import com.lealone.storage.page.PageOperation.PageOperationResult;
+import com.lealone.transaction.TransactionEngine;
 
 public class GlobalScheduler extends NetScheduler {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/scheduler/LinkableTask.java b/lealone-server/src/main/java/com/lealone/server/scheduler/LinkableTask.java
similarity index 65%
rename from lealone-server/src/main/java/org/lealone/server/scheduler/LinkableTask.java
rename to lealone-server/src/main/java/com/lealone/server/scheduler/LinkableTask.java
index 663fff2ac..82a4c6d81 100644
--- a/lealone-server/src/main/java/org/lealone/server/scheduler/LinkableTask.java
+++ b/lealone-server/src/main/java/com/lealone/server/scheduler/LinkableTask.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.scheduler;
+package com.lealone.server.scheduler;
 
-import org.lealone.db.async.AsyncTask;
-import org.lealone.db.link.LinkableBase;
+import com.lealone.db.async.AsyncTask;
+import com.lealone.db.link.LinkableBase;
 
 public abstract class LinkableTask extends LinkableBase implements AsyncTask {
 }
diff --git a/lealone-server/src/main/java/org/lealone/server/scheduler/PacketHandleTask.java b/lealone-server/src/main/java/com/lealone/server/scheduler/PacketHandleTask.java
similarity index 80%
rename from lealone-server/src/main/java/org/lealone/server/scheduler/PacketHandleTask.java
rename to lealone-server/src/main/java/com/lealone/server/scheduler/PacketHandleTask.java
index 19d3c84d5..10df586ac 100644
--- a/lealone-server/src/main/java/org/lealone/server/scheduler/PacketHandleTask.java
+++ b/lealone-server/src/main/java/com/lealone/server/scheduler/PacketHandleTask.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.scheduler;
+package com.lealone.server.scheduler;
 
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.session.ServerSession;
-import org.lealone.net.TransferInputStream;
-import org.lealone.server.TcpServerConnection;
-import org.lealone.server.handler.PacketHandler;
-import org.lealone.server.handler.PacketHandlers;
-import org.lealone.server.protocol.Packet;
-import org.lealone.server.protocol.PacketDecoder;
-import org.lealone.server.protocol.PacketDecoders;
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.session.ServerSession;
+import com.lealone.net.TransferInputStream;
+import com.lealone.server.TcpServerConnection;
+import com.lealone.server.handler.PacketHandler;
+import com.lealone.server.handler.PacketHandlers;
+import com.lealone.server.protocol.Packet;
+import com.lealone.server.protocol.PacketDecoder;
+import com.lealone.server.protocol.PacketDecoders;
 
 public class PacketHandleTask extends LinkableTask {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/scheduler/SessionInfo.java b/lealone-server/src/main/java/com/lealone/server/scheduler/SessionInfo.java
similarity index 90%
rename from lealone-server/src/main/java/org/lealone/server/scheduler/SessionInfo.java
rename to lealone-server/src/main/java/com/lealone/server/scheduler/SessionInfo.java
index 53368ad28..14aa2fc76 100644
--- a/lealone-server/src/main/java/org/lealone/server/scheduler/SessionInfo.java
+++ b/lealone-server/src/main/java/com/lealone/server/scheduler/SessionInfo.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.scheduler;
-
-import org.lealone.common.logging.Logger;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.db.async.AsyncTask;
-import org.lealone.db.link.LinkableBase;
-import org.lealone.db.link.LinkableList;
-import org.lealone.db.scheduler.Scheduler;
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.AsyncServerConnection;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.PreparedSQLStatement.YieldableCommand;
+package com.lealone.server.scheduler;
+
+import com.lealone.common.logging.Logger;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.db.async.AsyncTask;
+import com.lealone.db.link.LinkableBase;
+import com.lealone.db.link.LinkableList;
+import com.lealone.db.scheduler.Scheduler;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.AsyncServerConnection;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.PreparedSQLStatement.YieldableCommand;
 
 public class SessionInfo extends LinkableBase implements ServerSession.TimeoutListener {
 
diff --git a/lealone-server/src/main/java/org/lealone/server/scheduler/SessionInitTask.java b/lealone-server/src/main/java/com/lealone/server/scheduler/SessionInitTask.java
similarity index 84%
rename from lealone-server/src/main/java/org/lealone/server/scheduler/SessionInitTask.java
rename to lealone-server/src/main/java/com/lealone/server/scheduler/SessionInitTask.java
index 016e38c60..8e7392f7b 100644
--- a/lealone-server/src/main/java/org/lealone/server/scheduler/SessionInitTask.java
+++ b/lealone-server/src/main/java/com/lealone/server/scheduler/SessionInitTask.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.server.scheduler;
+package com.lealone.server.scheduler;
 
-import org.lealone.db.link.LinkableBase;
-import org.lealone.server.TcpServerConnection;
-import org.lealone.server.protocol.session.SessionInit;
+import com.lealone.db.link.LinkableBase;
+import com.lealone.server.TcpServerConnection;
+import com.lealone.server.protocol.session.SessionInit;
 
 //如果数据库还没有初始化，只会有一个线程去初始化它，这时其他线程就不能创建session，会返回null，所以可能会run多次。
 public class SessionInitTask extends LinkableBase {
diff --git a/lealone-server/src/main/java/org/lealone/server/scheduler/SessionValidator.java b/lealone-server/src/main/java/com/lealone/server/scheduler/SessionValidator.java
similarity index 94%
rename from lealone-server/src/main/java/org/lealone/server/scheduler/SessionValidator.java
rename to lealone-server/src/main/java/com/lealone/server/scheduler/SessionValidator.java
index 3bcad3146..97de3bc78 100644
--- a/lealone-server/src/main/java/org/lealone/server/scheduler/SessionValidator.java
+++ b/lealone-server/src/main/java/com/lealone/server/scheduler/SessionValidator.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.server.scheduler;
+package com.lealone.server.scheduler;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.SysProperties;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.SysProperties;
 
 /**
  * @author H2 Group
diff --git a/lealone-server/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine b/lealone-server/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
new file mode 100644
index 000000000..328ff0ab7
--- /dev/null
+++ b/lealone-server/src/main/resources/META-INF/services/com.lealone.server.ProtocolServerEngine
@@ -0,0 +1 @@
+com.lealone.server.TcpServerEngine
\ No newline at end of file
diff --git a/lealone-server/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine b/lealone-server/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
deleted file mode 100644
index ab494d55e..000000000
--- a/lealone-server/src/main/resources/META-INF/services/org.lealone.server.ProtocolServerEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.server.TcpServerEngine
diff --git a/lealone-sql/pom.xml b/lealone-sql/pom.xml
index fae066875..249d46520 100644
--- a/lealone-sql/pom.xml
+++ b/lealone-sql/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-db
             ${project.version}
         
diff --git a/lealone-sql/src/main/java/org/lealone/sql/LealoneSQLEngine.java b/lealone-sql/src/main/java/com/lealone/sql/LealoneSQLEngine.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/LealoneSQLEngine.java
rename to lealone-sql/src/main/java/com/lealone/sql/LealoneSQLEngine.java
index 8df943ea6..9fd42362a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/LealoneSQLEngine.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/LealoneSQLEngine.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
-import org.lealone.db.Constants;
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.Constants;
+import com.lealone.db.session.ServerSession;
 
 public class LealoneSQLEngine extends SQLEngineBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/LealoneSQLParser.java b/lealone-sql/src/main/java/com/lealone/sql/LealoneSQLParser.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/LealoneSQLParser.java
rename to lealone-sql/src/main/java/com/lealone/sql/LealoneSQLParser.java
index a38748591..e1d2a5865 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/LealoneSQLParser.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/LealoneSQLParser.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.session.ServerSession;
 
 public class LealoneSQLParser extends SQLParserBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/SQLEngineBase.java b/lealone-sql/src/main/java/com/lealone/sql/SQLEngineBase.java
similarity index 69%
rename from lealone-sql/src/main/java/org/lealone/sql/SQLEngineBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/SQLEngineBase.java
index 4aed03ab5..8f19aac63 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/SQLEngineBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/SQLEngineBase.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql;
-
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.db.value.Value;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.condition.ConditionAndOr;
+package com.lealone.sql;
+
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.db.value.Value;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.condition.ConditionAndOr;
 
 public abstract class SQLEngineBase extends PluginBase implements SQLEngine {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/SQLParserBase.java b/lealone-sql/src/main/java/com/lealone/sql/SQLParserBase.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/SQLParserBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/SQLParserBase.java
index 4b41d079c..44d8abd2d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/SQLParserBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/SQLParserBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -12,170 +12,170 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.exceptions.UnsupportedSchemaException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.DbSetting;
-import org.lealone.db.DbSettings;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.Procedure;
-import org.lealone.db.RunMode;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.auth.Right;
-import org.lealone.db.auth.User;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.schema.FunctionAlias;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.schema.UserDataType;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.SessionSetting;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Column.EnumColumn;
-import org.lealone.db.table.Column.ListColumn;
-import org.lealone.db.table.Column.MapColumn;
-import org.lealone.db.table.Column.SetColumn;
-import org.lealone.db.table.CreateTableData;
-import org.lealone.db.table.DummyTable;
-import org.lealone.db.table.RangeTable;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableView;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.sql.admin.CreatePlugin;
-import org.lealone.sql.admin.DropPlugin;
-import org.lealone.sql.admin.ShutdownDatabase;
-import org.lealone.sql.admin.ShutdownPlugin;
-import org.lealone.sql.admin.ShutdownServer;
-import org.lealone.sql.admin.StartPlugin;
-import org.lealone.sql.admin.StartServer;
-import org.lealone.sql.ddl.AlterDatabase;
-import org.lealone.sql.ddl.AlterIndexRename;
-import org.lealone.sql.ddl.AlterSchemaRename;
-import org.lealone.sql.ddl.AlterSequence;
-import org.lealone.sql.ddl.AlterTableAddConstraint;
-import org.lealone.sql.ddl.AlterTableAlterColumn;
-import org.lealone.sql.ddl.AlterTableDropConstraint;
-import org.lealone.sql.ddl.AlterTableRename;
-import org.lealone.sql.ddl.AlterTableRenameColumn;
-import org.lealone.sql.ddl.AlterTableSet;
-import org.lealone.sql.ddl.AlterUser;
-import org.lealone.sql.ddl.AlterView;
-import org.lealone.sql.ddl.Analyze;
-import org.lealone.sql.ddl.CreateAggregate;
-import org.lealone.sql.ddl.CreateConstant;
-import org.lealone.sql.ddl.CreateDatabase;
-import org.lealone.sql.ddl.CreateFunctionAlias;
-import org.lealone.sql.ddl.CreateIndex;
-import org.lealone.sql.ddl.CreateRole;
-import org.lealone.sql.ddl.CreateSchema;
-import org.lealone.sql.ddl.CreateSequence;
-import org.lealone.sql.ddl.CreateService;
-import org.lealone.sql.ddl.CreateTable;
-import org.lealone.sql.ddl.CreateTrigger;
-import org.lealone.sql.ddl.CreateUser;
-import org.lealone.sql.ddl.CreateUserDataType;
-import org.lealone.sql.ddl.CreateView;
-import org.lealone.sql.ddl.DeallocateProcedure;
-import org.lealone.sql.ddl.DefinitionStatement;
-import org.lealone.sql.ddl.DropAggregate;
-import org.lealone.sql.ddl.DropConstant;
-import org.lealone.sql.ddl.DropDatabase;
-import org.lealone.sql.ddl.DropFunctionAlias;
-import org.lealone.sql.ddl.DropIndex;
-import org.lealone.sql.ddl.DropRole;
-import org.lealone.sql.ddl.DropSchema;
-import org.lealone.sql.ddl.DropSequence;
-import org.lealone.sql.ddl.DropService;
-import org.lealone.sql.ddl.DropTable;
-import org.lealone.sql.ddl.DropTrigger;
-import org.lealone.sql.ddl.DropUser;
-import org.lealone.sql.ddl.DropUserDataType;
-import org.lealone.sql.ddl.DropView;
-import org.lealone.sql.ddl.GrantRevoke;
-import org.lealone.sql.ddl.PrepareProcedure;
-import org.lealone.sql.ddl.RepairTable;
-import org.lealone.sql.ddl.SetComment;
-import org.lealone.sql.ddl.TruncateTable;
-import org.lealone.sql.ddl.UserStatement;
-import org.lealone.sql.dml.Backup;
-import org.lealone.sql.dml.Call;
-import org.lealone.sql.dml.Delete;
-import org.lealone.sql.dml.ExecuteProcedure;
-import org.lealone.sql.dml.ExecuteService;
-import org.lealone.sql.dml.ExecuteStatement;
-import org.lealone.sql.dml.Explain;
-import org.lealone.sql.dml.GenScript;
-import org.lealone.sql.dml.Insert;
-import org.lealone.sql.dml.Merge;
-import org.lealone.sql.dml.NoOperation;
-import org.lealone.sql.dml.RunScript;
-import org.lealone.sql.dml.SetDatabase;
-import org.lealone.sql.dml.SetSession;
-import org.lealone.sql.dml.SetStatement;
-import org.lealone.sql.dml.TransactionStatement;
-import org.lealone.sql.dml.Update;
-import org.lealone.sql.expression.Alias;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ExpressionList;
-import org.lealone.sql.expression.Operation;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SelectOrderBy;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.Variable;
-import org.lealone.sql.expression.Wildcard;
-import org.lealone.sql.expression.aggregate.AGroupConcat;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.condition.CompareLike;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.condition.ConditionExists;
-import org.lealone.sql.expression.condition.ConditionIn;
-import org.lealone.sql.expression.condition.ConditionInSelect;
-import org.lealone.sql.expression.condition.ConditionNot;
-import org.lealone.sql.expression.function.DateTimeFunction;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.FunctionTable;
-import org.lealone.sql.expression.function.JavaFunction;
-import org.lealone.sql.expression.function.StringFunction;
-import org.lealone.sql.expression.function.SystemFunction;
-import org.lealone.sql.expression.function.TableFunction;
-import org.lealone.sql.expression.subquery.SubQuery;
-import org.lealone.sql.optimizer.SingleColumnResolver;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.optimizer.TableFilter.TableFilterVisitor;
-import org.lealone.sql.query.Query;
-import org.lealone.sql.query.Select;
-import org.lealone.sql.query.SelectUnion;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.UnsupportedSchemaException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.DbSetting;
+import com.lealone.db.DbSettings;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.Procedure;
+import com.lealone.db.RunMode;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.auth.Right;
+import com.lealone.db.auth.User;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.schema.FunctionAlias;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.schema.UserDataType;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.SessionSetting;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Column.EnumColumn;
+import com.lealone.db.table.Column.ListColumn;
+import com.lealone.db.table.Column.MapColumn;
+import com.lealone.db.table.Column.SetColumn;
+import com.lealone.db.table.CreateTableData;
+import com.lealone.db.table.DummyTable;
+import com.lealone.db.table.RangeTable;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableView;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.sql.admin.CreatePlugin;
+import com.lealone.sql.admin.DropPlugin;
+import com.lealone.sql.admin.ShutdownDatabase;
+import com.lealone.sql.admin.ShutdownPlugin;
+import com.lealone.sql.admin.ShutdownServer;
+import com.lealone.sql.admin.StartPlugin;
+import com.lealone.sql.admin.StartServer;
+import com.lealone.sql.ddl.AlterDatabase;
+import com.lealone.sql.ddl.AlterIndexRename;
+import com.lealone.sql.ddl.AlterSchemaRename;
+import com.lealone.sql.ddl.AlterSequence;
+import com.lealone.sql.ddl.AlterTableAddConstraint;
+import com.lealone.sql.ddl.AlterTableAlterColumn;
+import com.lealone.sql.ddl.AlterTableDropConstraint;
+import com.lealone.sql.ddl.AlterTableRename;
+import com.lealone.sql.ddl.AlterTableRenameColumn;
+import com.lealone.sql.ddl.AlterTableSet;
+import com.lealone.sql.ddl.AlterUser;
+import com.lealone.sql.ddl.AlterView;
+import com.lealone.sql.ddl.Analyze;
+import com.lealone.sql.ddl.CreateAggregate;
+import com.lealone.sql.ddl.CreateConstant;
+import com.lealone.sql.ddl.CreateDatabase;
+import com.lealone.sql.ddl.CreateFunctionAlias;
+import com.lealone.sql.ddl.CreateIndex;
+import com.lealone.sql.ddl.CreateRole;
+import com.lealone.sql.ddl.CreateSchema;
+import com.lealone.sql.ddl.CreateSequence;
+import com.lealone.sql.ddl.CreateService;
+import com.lealone.sql.ddl.CreateTable;
+import com.lealone.sql.ddl.CreateTrigger;
+import com.lealone.sql.ddl.CreateUser;
+import com.lealone.sql.ddl.CreateUserDataType;
+import com.lealone.sql.ddl.CreateView;
+import com.lealone.sql.ddl.DeallocateProcedure;
+import com.lealone.sql.ddl.DefinitionStatement;
+import com.lealone.sql.ddl.DropAggregate;
+import com.lealone.sql.ddl.DropConstant;
+import com.lealone.sql.ddl.DropDatabase;
+import com.lealone.sql.ddl.DropFunctionAlias;
+import com.lealone.sql.ddl.DropIndex;
+import com.lealone.sql.ddl.DropRole;
+import com.lealone.sql.ddl.DropSchema;
+import com.lealone.sql.ddl.DropSequence;
+import com.lealone.sql.ddl.DropService;
+import com.lealone.sql.ddl.DropTable;
+import com.lealone.sql.ddl.DropTrigger;
+import com.lealone.sql.ddl.DropUser;
+import com.lealone.sql.ddl.DropUserDataType;
+import com.lealone.sql.ddl.DropView;
+import com.lealone.sql.ddl.GrantRevoke;
+import com.lealone.sql.ddl.PrepareProcedure;
+import com.lealone.sql.ddl.RepairTable;
+import com.lealone.sql.ddl.SetComment;
+import com.lealone.sql.ddl.TruncateTable;
+import com.lealone.sql.ddl.UserStatement;
+import com.lealone.sql.dml.Backup;
+import com.lealone.sql.dml.Call;
+import com.lealone.sql.dml.Delete;
+import com.lealone.sql.dml.ExecuteProcedure;
+import com.lealone.sql.dml.ExecuteService;
+import com.lealone.sql.dml.ExecuteStatement;
+import com.lealone.sql.dml.Explain;
+import com.lealone.sql.dml.GenScript;
+import com.lealone.sql.dml.Insert;
+import com.lealone.sql.dml.Merge;
+import com.lealone.sql.dml.NoOperation;
+import com.lealone.sql.dml.RunScript;
+import com.lealone.sql.dml.SetDatabase;
+import com.lealone.sql.dml.SetSession;
+import com.lealone.sql.dml.SetStatement;
+import com.lealone.sql.dml.TransactionStatement;
+import com.lealone.sql.dml.Update;
+import com.lealone.sql.expression.Alias;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ExpressionList;
+import com.lealone.sql.expression.Operation;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SelectOrderBy;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.Variable;
+import com.lealone.sql.expression.Wildcard;
+import com.lealone.sql.expression.aggregate.AGroupConcat;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.condition.CompareLike;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.condition.ConditionExists;
+import com.lealone.sql.expression.condition.ConditionIn;
+import com.lealone.sql.expression.condition.ConditionInSelect;
+import com.lealone.sql.expression.condition.ConditionNot;
+import com.lealone.sql.expression.function.DateTimeFunction;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.FunctionTable;
+import com.lealone.sql.expression.function.JavaFunction;
+import com.lealone.sql.expression.function.StringFunction;
+import com.lealone.sql.expression.function.SystemFunction;
+import com.lealone.sql.expression.function.TableFunction;
+import com.lealone.sql.expression.subquery.SubQuery;
+import com.lealone.sql.optimizer.SingleColumnResolver;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.optimizer.TableFilter.TableFilterVisitor;
+import com.lealone.sql.query.Query;
+import com.lealone.sql.query.Select;
+import com.lealone.sql.query.SelectUnion;
 
 /**
  * The parser is used to convert a SQL statement string to an command object.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/StatementBase.java b/lealone-sql/src/main/java/com/lealone/sql/StatementBase.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/StatementBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/StatementBase.java
index da9b274d3..de58fca61 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/StatementBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/StatementBase.java
@@ -3,31 +3,31 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Database;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.DatabaseEventListener;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncCallback;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.db.value.Value;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.executor.YieldableLocalUpdate;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.query.YieldableLocalQuery;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Database;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.DatabaseEventListener;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncCallback;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.db.value.Value;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.executor.YieldableLocalUpdate;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.query.YieldableLocalQuery;
 
 /**
  * A parsed and prepared statement.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/StatementList.java b/lealone-sql/src/main/java/com/lealone/sql/StatementList.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/StatementList.java
rename to lealone-sql/src/main/java/com/lealone/sql/StatementList.java
index 7fab731b6..6afc89ecd 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/StatementList.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/StatementList.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql;
+package com.lealone.sql;
 
 import java.util.ArrayList;
 
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.Parameter;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.Parameter;
 
 /**
  * Represents a list of SQL statements.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/AdminStatement.java b/lealone-sql/src/main/java/com/lealone/sql/admin/AdminStatement.java
similarity index 75%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/AdminStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/AdminStatement.java
index ffd689013..28580cb03 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/AdminStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/AdminStatement.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.StatementBase;
 
 public abstract class AdminStatement extends StatementBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/CreatePlugin.java b/lealone-sql/src/main/java/com/lealone/sql/admin/CreatePlugin.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/CreatePlugin.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/CreatePlugin.java
index 8c941894f..8348b672d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/CreatePlugin.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/CreatePlugin.java
@@ -3,21 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
 import java.net.URL;
 import java.net.URLClassLoader;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.Utils;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.Utils;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 public class CreatePlugin extends AdminStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/DropPlugin.java b/lealone-sql/src/main/java/com/lealone/sql/admin/DropPlugin.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/DropPlugin.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/DropPlugin.java
index 9e44d9236..56f42cdc4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/DropPlugin.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/DropPlugin.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.PluginObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.admin;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.PluginObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 public class DropPlugin extends AdminStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownDatabase.java b/lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownDatabase.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownDatabase.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownDatabase.java
index 05314522a..204ab3055 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownDatabase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownDatabase.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownPlugin.java b/lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownPlugin.java
similarity index 77%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownPlugin.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownPlugin.java
index 19ae20d5a..00e775862 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownPlugin.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownPlugin.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.PluginObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.PluginObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 public class ShutdownPlugin extends AdminStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownServer.java b/lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownServer.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownServer.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownServer.java
index 06feb21c0..a152d9417 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/ShutdownServer.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/ShutdownServer.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.ThreadUtils;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.PluginManager;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.ProtocolServer;
-import org.lealone.server.ProtocolServerEngine;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.ThreadUtils;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.PluginManager;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.ProtocolServer;
+import com.lealone.server.ProtocolServerEngine;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/StartPlugin.java b/lealone-sql/src/main/java/com/lealone/sql/admin/StartPlugin.java
similarity index 77%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/StartPlugin.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/StartPlugin.java
index e0f4e0c29..79ae8dbf5 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/StartPlugin.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/StartPlugin.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.PluginObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.PluginObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 public class StartPlugin extends AdminStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/admin/StartServer.java b/lealone-sql/src/main/java/com/lealone/sql/admin/StartServer.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/admin/StartServer.java
rename to lealone-sql/src/main/java/com/lealone/sql/admin/StartServer.java
index 2c7134508..6cb963a5c 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/admin/StartServer.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/admin/StartServer.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.admin;
+package com.lealone.sql.admin;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.session.ServerSession;
-import org.lealone.server.ProtocolServerEngine;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.server.ProtocolServerEngine;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterDatabase.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterDatabase.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterDatabase.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterDatabase.java
index 37711570e..0a161c5c9 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterDatabase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterDatabase.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.RunMode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.RunMode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterIndexRename.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterIndexRename.java
similarity index 77%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterIndexRename.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterIndexRename.java
index 4333ab898..ffab751e3 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterIndexRename.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterIndexRename.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.index.Index;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.index.Index;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterSchemaRename.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterSchemaRename.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterSchemaRename.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterSchemaRename.java
index 40225d79e..0871f3e34 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterSchemaRename.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterSchemaRename.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterSequence.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterSequence.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterSequence.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterSequence.java
index 62487a1a2..960b66c4d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterSequence.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterSequence.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableAddConstraint.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableAddConstraint.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableAddConstraint.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableAddConstraint.java
index 368217eea..14219ebfe 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableAddConstraint.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableAddConstraint.java
@@ -3,31 +3,31 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.constraint.ConstraintCheck;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.constraint.ConstraintUnique;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.constraint.ConstraintCheck;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.constraint.ConstraintUnique;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableAlterColumn.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableAlterColumn.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableAlterColumn.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableAlterColumn.java
index ee4f8014d..e841ae259 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableAlterColumn.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableAlterColumn.java
@@ -3,31 +3,31 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Result;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableView;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.visitor.DependenciesVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Result;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableView;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.visitor.DependenciesVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
 
 /**
  * This class represents the statements
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableDropConstraint.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableDropConstraint.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableDropConstraint.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableDropConstraint.java
index 1b6f57cfa..1cc40d4b7 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableDropConstraint.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableDropConstraint.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableRename.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableRename.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableRename.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableRename.java
index 2858018b3..5cd4c1b50 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableRename.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableRename.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableRenameColumn.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableRenameColumn.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableRenameColumn.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableRenameColumn.java
index d6f502f4c..e0f660fb4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableRenameColumn.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableRenameColumn.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.auth.Right;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.optimizer.SingleColumnResolver;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.auth.Right;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.optimizer.SingleColumnResolver;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableSet.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableSet.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableSet.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableSet.java
index 44a35a61e..9c2584748 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterTableSet.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterTableSet.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.auth.Right;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.auth.Right;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterUser.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterUser.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterUser.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterUser.java
index eafd75a03..cfea038c5 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterUser.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterUser.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.User;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.User;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statements
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterView.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterView.java
similarity index 75%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AlterView.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AlterView.java
index 2c7391c30..3456f04eb 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AlterView.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AlterView.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.auth.Right;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.TableView;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.auth.Right;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.TableView;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/Analyze.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/Analyze.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/Analyze.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/Analyze.java
index 6d4ef0b01..da5cb06d7 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/Analyze.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/Analyze.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/AuthStatement.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/AuthStatement.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/AuthStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/AuthStatement.java
index 841bb6b15..1f06784b9 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/AuthStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/AuthStatement.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.session.ServerSession;
+import com.lealone.db.session.ServerSession;
 
 //只是一个标记类
 public abstract class AuthStatement extends DefinitionStatement {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateAggregate.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateAggregate.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateAggregate.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateAggregate.java
index 36c622a20..1cf098f78 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateAggregate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateAggregate.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateConstant.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateConstant.java
similarity index 81%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateConstant.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateConstant.java
index e990244e8..be8600342 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateConstant.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateConstant.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Constant;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Constant;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateDatabase.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateDatabase.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateDatabase.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateDatabase.java
index a46fbd3b5..351a51071 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateDatabase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateDatabase.java
@@ -3,19 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.Database;
-import org.lealone.db.DbSetting;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.Mode;
-import org.lealone.db.RunMode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.Database;
+import com.lealone.db.DbSetting;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.Mode;
+import com.lealone.db.RunMode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateFunctionAlias.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateFunctionAlias.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateFunctionAlias.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateFunctionAlias.java
index 54cdb7620..dd9db411c 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateFunctionAlias.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateFunctionAlias.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.FunctionAlias;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.FunctionAlias;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateIndex.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateIndex.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateIndex.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateIndex.java
index c4a3e9059..76175ab39 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateIndex.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateIndex.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateRole.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateRole.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateRole.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateRole.java
index 5aa3b01da..160c94c65 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateRole.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateRole.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Role;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Role;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateSchema.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateSchema.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateSchema.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateSchema.java
index 8e1ec8a71..d053f9deb 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateSchema.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateSchema.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.User;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.User;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateSequence.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateSequence.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateSequence.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateSequence.java
index 79c0f9088..465fe8e0a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateSequence.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateSequence.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateService.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateService.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateService.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateService.java
index 23fa1fa40..28f770bbd 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateService.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateService.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -15,33 +15,33 @@
 import java.util.TreeSet;
 import java.util.UUID;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CamelCaseHelper;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.PluginManager;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.service.JavaServiceExecutorFactory;
-import org.lealone.db.service.Service;
-import org.lealone.db.service.ServiceExecutor;
-import org.lealone.db.service.ServiceExecutorFactory;
-import org.lealone.db.service.ServiceMethod;
-import org.lealone.db.service.ServiceSetting;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Column.ListColumn;
-import org.lealone.db.table.Column.MapColumn;
-import org.lealone.db.table.Column.SetColumn;
-import org.lealone.db.table.CreateTableData;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueUuid;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CamelCaseHelper;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.PluginManager;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.service.JavaServiceExecutorFactory;
+import com.lealone.db.service.Service;
+import com.lealone.db.service.ServiceExecutor;
+import com.lealone.db.service.ServiceExecutorFactory;
+import com.lealone.db.service.ServiceMethod;
+import com.lealone.db.service.ServiceSetting;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.CreateTableData;
+import com.lealone.db.table.Column.ListColumn;
+import com.lealone.db.table.Column.MapColumn;
+import com.lealone.db.table.Column.SetColumn;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueUuid;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
@@ -271,7 +271,7 @@ private void genServiceInterfaceCode() {
         StringBuilder psInitBuff = new StringBuilder();
 
         TreeSet importSet = new TreeSet<>();
-        importSet.add("org.lealone.client.ClientServiceProxy");
+        importSet.add("com.lealone.client.ClientServiceProxy");
         importSet.add("java.sql.*");
 
         // 生成方法签名和方法体的代码
@@ -713,7 +713,7 @@ private StringBuilder genServiceExecutorCode(boolean writeFile) {
         importSet.add(ServiceExecutor.class.getName());
 
         // 生成public Value executeService(String methodName, Value[] methodArgs)方法
-        importSet.add("org.lealone.db.value.*");
+        importSet.add("com.lealone.db.value.*");
         StringBuilder buffValueMethod = new ValueServiceExecutorMethodGenerator().genCode(importSet,
                 "Value executeService(String methodName, Value[] methodArgs)");
 
@@ -737,7 +737,7 @@ private StringBuilder genServiceExecutorCode(boolean writeFile) {
             String varInit = "";
             for (CreateTable m : serviceMethods) {
                 if (m.data.columns.size() - 1 > 0) {
-                    importSet.add("org.lealone.plugins.orm.json.JsonArray");
+                    importSet.add("com.lealone.plugins.orm.json.JsonArray");
                     varInit = "        JsonArray ja = null;\r\n";
                     break;
                 }
@@ -984,11 +984,11 @@ private static String getJsonArrayMethodName(Column c, String type0, int i,
         case "OBJECT":
             return "ja.getValue(" + i + ")";
         case "BLOB":
-            return "new org.lealone.db.value.ReadonlyBlob(ja.getString(" + i + "))";
+            return "new com.lealone.db.value.ReadonlyBlob(ja.getString(" + i + "))";
         case "CLOB":
-            return "new org.lealone.db.value.ReadonlyClob(ja.getString(" + i + "))";
+            return "new com.lealone.db.value.ReadonlyClob(ja.getString(" + i + "))";
         case "ARRAY":
-            return "new org.lealone.db.value.ReadonlyArray(ja.getString(" + i + "))";
+            return "new com.lealone.db.value.ReadonlyArray(ja.getString(" + i + "))";
         case "RESULT_SET":
             return "ja.getValue(" + i + ")";
         }
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTable.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateTable.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTable.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateTable.java
index 9e2603273..2e135953f 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTable.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateTable.java
@@ -3,36 +3,36 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.ConfigException;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.DbSetting;
-import org.lealone.db.PluginManager;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.CreateTableData;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableCodeGenerator;
-import org.lealone.db.table.TableSetting;
-import org.lealone.db.value.DataType;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.dml.Insert;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Query;
-import org.lealone.storage.StorageSetting;
+import com.lealone.common.exceptions.ConfigException;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.DbSetting;
+import com.lealone.db.PluginManager;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.CreateTableData;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableCodeGenerator;
+import com.lealone.db.table.TableSetting;
+import com.lealone.db.value.DataType;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.dml.Insert;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Query;
+import com.lealone.storage.StorageSetting;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTrigger.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateTrigger.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTrigger.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateTrigger.java
index b49504351..735eac508 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTrigger.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateTrigger.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.TriggerObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.TriggerObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateUser.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateUser.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateUser.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateUser.java
index f4b2f9404..4e287e9c0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateUser.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateUser.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.PasswordHash;
-import org.lealone.db.auth.User;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.PasswordHash;
+import com.lealone.db.auth.User;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateUserDataType.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateUserDataType.java
similarity index 81%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateUserDataType.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateUserDataType.java
index 87a5d9002..f7810a0d0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateUserDataType.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateUserDataType.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.UserDataType;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.DataType;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.UserDataType;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.DataType;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateView.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateView.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/CreateView.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/CreateView.java
index 02b1cbd97..ea37aebd6 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateView.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/CreateView.java
@@ -3,24 +3,24 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableType;
-import org.lealone.db.table.TableView;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.query.Query;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableType;
+import com.lealone.db.table.TableView;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.query.Query;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DatabaseStatement.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DatabaseStatement.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DatabaseStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DatabaseStatement.java
index 96a3f2309..d37247a39 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DatabaseStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DatabaseStatement.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.ConfigException;
-import org.lealone.common.util.CaseInsensitiveMap;
-import org.lealone.db.DbSetting;
-import org.lealone.db.session.ServerSession;
+import com.lealone.common.exceptions.ConfigException;
+import com.lealone.common.util.CaseInsensitiveMap;
+import com.lealone.db.DbSetting;
+import com.lealone.db.session.ServerSession;
 
 public abstract class DatabaseStatement extends DefinitionStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DeallocateProcedure.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DeallocateProcedure.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DeallocateProcedure.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DeallocateProcedure.java
index b7e717a57..0af43a479 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DeallocateProcedure.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DeallocateProcedure.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DefinitionStatement.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DefinitionStatement.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DefinitionStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DefinitionStatement.java
index d9f53680d..8173e640a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DefinitionStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DefinitionStatement.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.StatementBase;
 
 /**
  * This class represents a definition statement, for example a CREATE or DROP.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropAggregate.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropAggregate.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropAggregate.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropAggregate.java
index c12b1ddd7..977b637f3 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropAggregate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropAggregate.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropConstant.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropConstant.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropConstant.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropConstant.java
index 151ce1d9c..45a640299 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropConstant.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropConstant.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Constant;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Constant;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropDatabase.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropDatabase.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropDatabase.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropDatabase.java
index 0d49fc586..0583839af 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropDatabase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropDatabase.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropFunctionAlias.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropFunctionAlias.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropFunctionAlias.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropFunctionAlias.java
index ab9405fb9..82c99c051 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropFunctionAlias.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropFunctionAlias.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.FunctionAlias;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.FunctionAlias;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropIndex.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropIndex.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropIndex.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropIndex.java
index 46b21353a..f1c8d689f 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropIndex.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropIndex.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.index.Index;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.index.Index;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropRole.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropRole.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropRole.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropRole.java
index d2d09b45a..d46ad3039 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropRole.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropRole.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Role;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Role;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropSchema.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropSchema.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropSchema.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropSchema.java
index 4ccb3acaf..e7e196b6e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropSchema.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropSchema.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropSequence.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropSequence.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropSequence.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropSequence.java
index 5c27b37d3..e77a47508 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropSequence.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropSequence.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropService.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropService.java
similarity index 77%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropService.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropService.java
index 438b23fc8..0e02e0448 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropService.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropService.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropTable.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropTable.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropTable.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropTable.java
index 39507b126..c417f63bc 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropTable.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropTable.java
@@ -3,23 +3,23 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableView;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableView;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropTrigger.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropTrigger.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropTrigger.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropTrigger.java
index f81f7f6b8..4e2399a5e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropTrigger.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropTrigger.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.TriggerObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.TriggerObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropUser.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropUser.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropUser.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropUser.java
index bf292e720..379ea98fa 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropUser.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropUser.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.User;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.User;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropUserDataType.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropUserDataType.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropUserDataType.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropUserDataType.java
index ec4c662aa..7381c919b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropUserDataType.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropUserDataType.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.UserDataType;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.UserDataType;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropView.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropView.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/DropView.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/DropView.java
index 672b2738e..e4d0f7063 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/DropView.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/DropView.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.constraint.ConstraintReferential;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableType;
-import org.lealone.db.table.TableView;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.constraint.ConstraintReferential;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableType;
+import com.lealone.db.table.TableView;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/GrantRevoke.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/GrantRevoke.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/GrantRevoke.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/GrantRevoke.java
index 11a7c0f59..2119c3738 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/GrantRevoke.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/GrantRevoke.java
@@ -3,23 +3,23 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.auth.RightOwner;
-import org.lealone.db.auth.Role;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.auth.RightOwner;
+import com.lealone.db.auth.Role;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statements
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/PrepareProcedure.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/PrepareProcedure.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/PrepareProcedure.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/PrepareProcedure.java
index 215063a08..660c98e9a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/PrepareProcedure.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/PrepareProcedure.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
 import java.util.ArrayList;
 
-import org.lealone.db.Procedure;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.Parameter;
+import com.lealone.db.Procedure;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.expression.Parameter;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/RepairTable.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/RepairTable.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/RepairTable.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/RepairTable.java
index 571d61460..1e7ed8384 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/RepairTable.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/RepairTable.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/SchemaStatement.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/SchemaStatement.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/SchemaStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/SchemaStatement.java
index 54913f1ca..f0939e398 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/SchemaStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/SchemaStatement.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.DbObjectType;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
 
 /**
  * This class represents a non-transaction statement that involves a schema.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/SetComment.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/SetComment.java
similarity index 90%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/SetComment.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/SetComment.java
index 63ad98652..50a6409d4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/SetComment.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/SetComment.java
@@ -3,20 +3,20 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Comment;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Comment;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/TruncateTable.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/TruncateTable.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/TruncateTable.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/TruncateTable.java
index e550b3e69..63382a264 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/TruncateTable.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/TruncateTable.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.ddl;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.sql.SQLStatement;
+package com.lealone.sql.ddl;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/UserStatement.java b/lealone-sql/src/main/java/com/lealone/sql/ddl/UserStatement.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/ddl/UserStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/ddl/UserStatement.java
index 2c8fe4db8..7b22537e3 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/ddl/UserStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/ddl/UserStatement.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.ddl;
+package com.lealone.sql.ddl;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.Expression;
 
 public abstract class UserStatement extends AuthStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Backup.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Backup.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Backup.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Backup.java
index 601d568b1..803ed0b8a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Backup.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Backup.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.sql.Date;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Call.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Call.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Call.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Call.java
index 41f7223ba..4e6ce5a10 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Call.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Call.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.sql.ResultSet;
 
-import org.lealone.db.async.Future;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Delete.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Delete.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Delete.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Delete.java
index 4b166f63a..bb61c42ca 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Delete.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Delete.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.auth.Right;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.executor.YieldableBase;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.auth.Right;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.executor.YieldableBase;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteProcedure.java b/lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteProcedure.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteProcedure.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteProcedure.java
index 512e305a3..9cbc6e1d1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteProcedure.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteProcedure.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.util.ArrayList;
 
-import org.lealone.db.Procedure;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Parameter;
+import com.lealone.db.Procedure;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Parameter;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteService.java b/lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteService.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteService.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteService.java
index b74d5cce5..f90b563ed 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteService.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteService.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.db.async.Future;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.service.Service;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.service.Service;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteStatement.java b/lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteStatement.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteStatement.java
index 9a366d6e9..da234d723 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/ExecuteStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/ExecuteStatement.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.util.ArrayList;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
 
 public abstract class ExecuteStatement extends ManipulationStatement {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Explain.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Explain.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Explain.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Explain.java
index fa7d7f8b8..e1a89b3a6 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Explain.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Explain.java
@@ -3,25 +3,25 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import org.lealone.db.Database;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
+import com.lealone.db.Database;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/GenScript.java b/lealone-sql/src/main/java/com/lealone/sql/dml/GenScript.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/GenScript.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/GenScript.java
index 8ce4eb698..6c1adb86a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/GenScript.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/GenScript.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -22,47 +22,47 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.IOUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Comment;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.DbObjectType;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.Future;
-import org.lealone.db.auth.Right;
-import org.lealone.db.auth.Role;
-import org.lealone.db.auth.User;
-import org.lealone.db.constraint.Constraint;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.Row;
-import org.lealone.db.schema.Constant;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.SchemaObject;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.schema.TriggerObject;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.schema.UserDataType;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.optimizer.Optimizer;
-import org.lealone.sql.optimizer.PlanItem;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.IOUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Comment;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.DbObjectType;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.Future;
+import com.lealone.db.auth.Right;
+import com.lealone.db.auth.Role;
+import com.lealone.db.auth.User;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.Row;
+import com.lealone.db.schema.Constant;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.SchemaObject;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.schema.TriggerObject;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.schema.UserDataType;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.optimizer.Optimizer;
+import com.lealone.sql.optimizer.PlanItem;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Insert.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Insert.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Insert.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Insert.java
index ae838f5be..95f7978e8 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Insert.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Insert.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.auth.Right;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.auth.Right;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.sql.SQLStatement;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/ManipulationStatement.java b/lealone-sql/src/main/java/com/lealone/sql/dml/ManipulationStatement.java
similarity index 71%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/ManipulationStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/ManipulationStatement.java
index beacdf319..e5dacfb36 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/ManipulationStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/ManipulationStatement.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.StatementBase;
 
 public abstract class ManipulationStatement extends StatementBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/MerSert.java b/lealone-sql/src/main/java/com/lealone/sql/dml/MerSert.java
similarity index 90%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/MerSert.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/MerSert.java
index 4ebce984b..44a93a1e1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/MerSert.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/MerSert.java
@@ -3,29 +3,29 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.DataHandler;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.executor.YieldableLoopUpdateBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.query.Query;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.DataHandler;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.executor.YieldableLoopUpdateBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.query.Query;
 
 // merge和insert的基类
 public abstract class MerSert extends ManipulationStatement {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Merge.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Merge.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Merge.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Merge.java
index f8dcc01fe..948e46756 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Merge.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Merge.java
@@ -3,27 +3,27 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.auth.Right;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.Parameter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.auth.Right;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.expression.Parameter;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/NoOperation.java b/lealone-sql/src/main/java/com/lealone/sql/dml/NoOperation.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/NoOperation.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/NoOperation.java
index d5e4155a0..117df0d71 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/NoOperation.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/NoOperation.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * Represents an empty statement or a statement that has no effect.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/RunScript.java b/lealone-sql/src/main/java/com/lealone/sql/dml/RunScript.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/RunScript.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/RunScript.java
index 9511c69e4..a50772afb 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/RunScript.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/RunScript.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.ScriptReader;
-import org.lealone.db.Constants;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.StatementBase;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.ScriptReader;
+import com.lealone.db.Constants;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.StatementBase;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/ScriptBase.java b/lealone-sql/src/main/java/com/lealone/sql/dml/ScriptBase.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/ScriptBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/ScriptBase.java
index ba1a1f419..6e072d2d1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/ScriptBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/ScriptBase.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -11,20 +11,20 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.lealone.common.compress.CompressTool;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.Expression;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.fs.FileStorageInputStream;
-import org.lealone.storage.fs.FileStorageOutputStream;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.compress.CompressTool;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.Expression;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.fs.FileStorageInputStream;
+import com.lealone.storage.fs.FileStorageOutputStream;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * This class is the base for RunScript and GenScript.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/SetDatabase.java b/lealone-sql/src/main/java/com/lealone/sql/dml/SetDatabase.java
similarity index 95%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/SetDatabase.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/SetDatabase.java
index 09e52bd7b..a2ba3b27e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/SetDatabase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/SetDatabase.java
@@ -3,22 +3,22 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.text.Collator;
 
-import org.lealone.common.compress.CompressTool;
-import org.lealone.common.compress.Compressor;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Database;
-import org.lealone.db.DbSetting;
-import org.lealone.db.Mode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.CompareMode;
+import com.lealone.common.compress.CompressTool;
+import com.lealone.common.compress.Compressor;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Database;
+import com.lealone.db.DbSetting;
+import com.lealone.db.Mode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.CompareMode;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/SetSession.java b/lealone-sql/src/main/java/com/lealone/sql/dml/SetSession.java
similarity index 90%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/SetSession.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/SetSession.java
index 29c6ad89d..34dcfd2c9 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/SetSession.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/SetSession.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.SessionSetting;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.SessionSetting;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/SetStatement.java b/lealone-sql/src/main/java/com/lealone/sql/dml/SetStatement.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/SetStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/SetStatement.java
index 542a06194..c9004d555 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/SetStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/SetStatement.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.ValueInt;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+package com.lealone.sql.dml;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.ValueInt;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/TransactionStatement.java b/lealone-sql/src/main/java/com/lealone/sql/dml/TransactionStatement.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/TransactionStatement.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/TransactionStatement.java
index 0547c36ea..4283d1e4b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/TransactionStatement.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/TransactionStatement.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.SQLStatement;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.SQLStatement;
 
 /**
  * Represents a transactional statement.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/UpDel.java b/lealone-sql/src/main/java/com/lealone/sql/dml/UpDel.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/UpDel.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/UpDel.java
index 9e2f7b3b4..c65fba6ae 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/UpDel.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/UpDel.java
@@ -3,27 +3,27 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
-
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.DataHandler;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.executor.YieldableLoopUpdateBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.evaluator.AlwaysTrueEvaluator;
-import org.lealone.sql.expression.evaluator.ExpressionEvaluator;
-import org.lealone.sql.expression.evaluator.ExpressionInterpreter;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.optimizer.TableIterator;
+package com.lealone.sql.dml;
+
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.DataHandler;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.executor.YieldableLoopUpdateBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.evaluator.AlwaysTrueEvaluator;
+import com.lealone.sql.expression.evaluator.ExpressionEvaluator;
+import com.lealone.sql.expression.evaluator.ExpressionInterpreter;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.optimizer.TableIterator;
 
 // update和delete的基类
 public abstract class UpDel extends ManipulationStatement {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/dml/Update.java b/lealone-sql/src/main/java/com/lealone/sql/dml/Update.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/dml/Update.java
rename to lealone-sql/src/main/java/com/lealone/sql/dml/Update.java
index 6eacb7586..45a55e55e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/dml/Update.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/dml/Update.java
@@ -3,30 +3,30 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.dml;
+package com.lealone.sql.dml;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.Utils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.auth.Right;
-import org.lealone.db.result.Row;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.ValueExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.Utils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.auth.Right;
+import com.lealone.db.result.Row;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.ValueExpression;
 
 /**
  * This class represents the statement
diff --git a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableBase.java b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableBase.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/executor/YieldableBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/executor/YieldableBase.java
index be7700e9e..2456eddaa 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableBase.java
@@ -3,28 +3,28 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.executor;
+package com.lealone.sql.executor;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.trace.Trace;
-import org.lealone.common.trace.TraceModuleType;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.api.DatabaseEventListener;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.db.value.Value;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.PreparedSQLStatement.Yieldable;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.Parameter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.trace.Trace;
+import com.lealone.common.trace.TraceModuleType;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.api.DatabaseEventListener;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.db.value.Value;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.PreparedSQLStatement.Yieldable;
+import com.lealone.sql.expression.Parameter;
 
 public abstract class YieldableBase implements Yieldable {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableLocalUpdate.java b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableLocalUpdate.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/executor/YieldableLocalUpdate.java
rename to lealone-sql/src/main/java/com/lealone/sql/executor/YieldableLocalUpdate.java
index e94cfaffa..1f2f6618b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableLocalUpdate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableLocalUpdate.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.executor;
+package com.lealone.sql.executor;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.sql.StatementBase;
 
 public class YieldableLocalUpdate extends YieldableUpdateBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableLoopUpdateBase.java b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableLoopUpdateBase.java
similarity index 90%
rename from lealone-sql/src/main/java/org/lealone/sql/executor/YieldableLoopUpdateBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/executor/YieldableLoopUpdateBase.java
index 157593a36..2fe5204c3 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableLoopUpdateBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableLoopUpdateBase.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.executor;
+package com.lealone.sql.executor;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.sql.StatementBase;
 
 public abstract class YieldableLoopUpdateBase extends YieldableUpdateBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableUpdateBase.java b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableUpdateBase.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/executor/YieldableUpdateBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/executor/YieldableUpdateBase.java
index 45ff709ab..004e21173 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/executor/YieldableUpdateBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/executor/YieldableUpdateBase.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.executor;
+package com.lealone.sql.executor;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.sql.StatementBase;
 
 public abstract class YieldableUpdateBase extends YieldableBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Alias.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Alias.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Alias.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Alias.java
index 6493330c3..345bb575c 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Alias.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Alias.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * A column alias as in SELECT 'Hello' AS NAME ...
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Expression.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Expression.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Expression.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Expression.java
index 90938eeaf..db5df18dc 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Expression.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Expression.java
@@ -3,29 +3,29 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.DbObject;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.expression.visitor.MapColumnsVisitor;
-import org.lealone.sql.expression.visitor.UpdateAggregateVisitor;
-import org.lealone.sql.optimizer.ColumnResolver;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.DbObject;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.expression.visitor.MapColumnsVisitor;
+import com.lealone.sql.expression.visitor.UpdateAggregateVisitor;
+import com.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * An expression is a operation, a value, or a function in a query.
@@ -33,7 +33,7 @@
  * @author H2 Group
  * @author zhh
  */
-public abstract class Expression implements org.lealone.sql.IExpression {
+public abstract class Expression implements com.lealone.sql.IExpression {
 
     private boolean addedToFilter;
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/ExpressionColumn.java b/lealone-sql/src/main/java/com/lealone/sql/expression/ExpressionColumn.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/ExpressionColumn.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/ExpressionColumn.java
index 97a530fc8..c3eed8829 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/ExpressionColumn.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/ExpressionColumn.java
@@ -3,30 +3,30 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
 import java.util.HashMap;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.schema.Constant;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueLob;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.AliasColumnResolver;
-import org.lealone.sql.optimizer.ColumnResolver;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Select;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.schema.Constant;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueLob;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.AliasColumnResolver;
+import com.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Select;
 
 /**
  * A expression that represents a column of a table or view.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/ExpressionList.java b/lealone-sql/src/main/java/com/lealone/sql/expression/ExpressionList.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/ExpressionList.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/ExpressionList.java
index eb620cdf6..febf78e85 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/ExpressionList.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/ExpressionList.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * A list of expressions, as in (ID, NAME).
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Operation.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Operation.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Operation.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Operation.java
index 3a317e086..45fe72299 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Operation.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Operation.java
@@ -3,19 +3,19 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.Mode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.Mode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * A mathematical expression, or string concatenation.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Parameter.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Parameter.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Parameter.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Parameter.java
index 677cc1cec..b640681e6 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Parameter.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Parameter.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+package com.lealone.sql.expression;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * A parameter of a prepared statement.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Rownum.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Rownum.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Rownum.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Rownum.java
index d3d1f0f53..400cd8192 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Rownum.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Rownum.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * Represents the ROWNUM function.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/SelectOrderBy.java b/lealone-sql/src/main/java/com/lealone/sql/expression/SelectOrderBy.java
similarity index 97%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/SelectOrderBy.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/SelectOrderBy.java
index 7524dcaa0..b4a2b5b36 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/SelectOrderBy.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/SelectOrderBy.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
 /**
  * Describes one element of the ORDER BY clause of a query.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/SequenceValue.java b/lealone-sql/src/main/java/com/lealone/sql/expression/SequenceValue.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/SequenceValue.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/SequenceValue.java
index 1b84fc814..859900818 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/SequenceValue.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/SequenceValue.java
@@ -3,14 +3,14 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * Wraps a sequence when used in a statement.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/ValueExpression.java b/lealone-sql/src/main/java/com/lealone/sql/expression/ValueExpression.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/ValueExpression.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/ValueExpression.java
index 044970f32..c84fa8939 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/ValueExpression.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/ValueExpression.java
@@ -3,17 +3,17 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
-
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
+package com.lealone.sql.expression;
+
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * An expression representing a constant value.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Variable.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Variable.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Variable.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Variable.java
index 6acf1e5fa..a84bd33b4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Variable.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Variable.java
@@ -3,12 +3,12 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
+package com.lealone.sql.expression;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * A user-defined variable, for example: @ID.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/Wildcard.java b/lealone-sql/src/main/java/com/lealone/sql/expression/Wildcard.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/Wildcard.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/Wildcard.java
index 717736fd4..003b3d769 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/Wildcard.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/Wildcard.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression;
-
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.ColumnResolver;
+package com.lealone.sql.expression;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.ColumnResolver;
 
 /**
  * A wildcard expression as in SELECT * FROM TEST.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ACount.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ACount.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ACount.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ACount.java
index e63cacf8f..fc8fdd1c5 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ACount.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ACount.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.query.Select;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.query.Select;
 
 // COUNT(x)
 public class ACount extends BuiltInAggregate {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ACountAll.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ACountAll.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ACountAll.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ACountAll.java
index 7867c1973..d2ea51ad2 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ACountAll.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ACountAll.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.query.Select;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.query.Select;
 
 // COUNT(*)
 public class ACountAll extends BuiltInAggregate {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ADefault.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ADefault.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ADefault.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ADefault.java
index e030d0289..5618455c9 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ADefault.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ADefault.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.query.Select;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.query.Select;
 
 public class ADefault extends BuiltInAggregate {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AGroupConcat.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AGroupConcat.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AGroupConcat.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AGroupConcat.java
index c4b5116dd..e22e8d534 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AGroupConcat.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AGroupConcat.java
@@ -3,24 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.SelectOrderBy;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.query.Select;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.SelectOrderBy;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.query.Select;
 
 public class AGroupConcat extends BuiltInAggregate {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AHistogram.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AHistogram.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AHistogram.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AHistogram.java
index e3416ad70..d3dbc1b2b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AHistogram.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AHistogram.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
 import java.util.Arrays;
 import java.util.Comparator;
 
-import org.lealone.db.Constants;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueLong;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.query.Select;
+import com.lealone.db.Constants;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueLong;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.query.Select;
 
 public class AHistogram extends BuiltInAggregate {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ASelectivity.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ASelectivity.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ASelectivity.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ASelectivity.java
index b7e858c2c..cbaa0fff1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/ASelectivity.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/ASelectivity.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
-import org.lealone.db.Constants;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.util.IntIntHashMap;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.query.Select;
+import com.lealone.db.Constants;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.util.IntIntHashMap;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.query.Select;
 
 public class ASelectivity extends BuiltInAggregate {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/Aggregate.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/Aggregate.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/Aggregate.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/Aggregate.java
index 16225f9a6..c705e60b1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/Aggregate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/Aggregate.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
 import java.util.HashMap;
 
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.query.Select;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.query.Select;
 
 /**
  * This class is used by the built-in aggregate functions,
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AggregateData.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AggregateData.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AggregateData.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AggregateData.java
index 27a53d7d0..143c38802 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/AggregateData.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/AggregateData.java
@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
 
 /**
  * Abstract class for the computation of an aggregate.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/BuiltInAggregate.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/BuiltInAggregate.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/BuiltInAggregate.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/BuiltInAggregate.java
index c9948c741..65dacb91e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/BuiltInAggregate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/BuiltInAggregate.java
@@ -3,27 +3,27 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
 import java.util.HashMap;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Select;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Select;
 
 /**
  * Implements the integrated aggregate functions, such as COUNT, MAX, SUM.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/JavaAggregate.java b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/JavaAggregate.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/JavaAggregate.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/JavaAggregate.java
index 218a3028d..8db7a3dc1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/aggregate/JavaAggregate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/aggregate/JavaAggregate.java
@@ -3,25 +3,25 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.aggregate;
+package com.lealone.sql.expression.aggregate;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.api.Aggregate;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.query.Select;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.api.Aggregate;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.query.Select;
 
 /**
  * This class wraps a user-defined aggregate.
@@ -29,7 +29,7 @@
  * @author H2 Group
  * @author zhh
  */
-public class JavaAggregate extends org.lealone.sql.expression.aggregate.Aggregate {
+public class JavaAggregate extends com.lealone.sql.expression.aggregate.Aggregate {
 
     private final UserAggregate userAggregate;
     private final Expression[] args;
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/CompareLike.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/CompareLike.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/CompareLike.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/CompareLike.java
index ba837c64b..ca59ec325 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/CompareLike.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/CompareLike.java
@@ -3,27 +3,27 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * Pattern matching comparison expression: WHERE NAME LIKE ?
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/Comparison.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/Comparison.java
similarity index 95%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/Comparison.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/Comparison.java
index a7e585132..5a65ef870 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/Comparison.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/Comparison.java
@@ -3,27 +3,27 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.SysProperties;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.expression.visitor.NotFromResolverVisitor;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.SysProperties;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.expression.visitor.NotFromResolverVisitor;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * Example comparison expressions are ID=1, NAME=NAME, NAME IS NULL.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/Condition.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/Condition.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/Condition.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/Condition.java
index 70ffab3e4..69b958aba 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/Condition.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/Condition.java
@@ -3,11 +3,11 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.sql.expression.Expression;
 
 /**
  * Represents a condition returning a boolean value, or NULL.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionAndOr.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionAndOr.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionAndOr.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionAndOr.java
index 842217b82..100217444 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionAndOr.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionAndOr.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.SysProperties;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.SysProperties;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * An 'and' or 'or' condition as in WHERE ID=1 AND NAME=?
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionExists.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionExists.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionExists.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionExists.java
index 8291d3092..a95ce24e3 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionExists.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionExists.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.query.Query;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.query.Query;
 
 /**
  * An 'exists' condition as in WHERE EXISTS(SELECT ...)
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionIn.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionIn.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionIn.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionIn.java
index a7026bb13..ad017c1d6 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionIn.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionIn.java
@@ -3,24 +3,24 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
 import java.util.ArrayList;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.expression.visitor.NotFromResolverVisitor;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.expression.visitor.NotFromResolverVisitor;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * An 'in' condition with a list of values, as in WHERE NAME IN(...)
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionInConstantSet.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionInConstantSet.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionInConstantSet.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionInConstantSet.java
index 8d6ddea63..a04a27362 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionInConstantSet.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionInConstantSet.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * Used for optimised IN(...) queries where the contents of the IN list are all
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionInSelect.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionInSelect.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionInSelect.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionInSelect.java
index b5045344e..660832174 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionInSelect.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionInSelect.java
@@ -3,25 +3,25 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.subquery.SubQueryResult;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.expression.visitor.NotFromResolverVisitor;
-import org.lealone.sql.optimizer.IndexCondition;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Query;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.subquery.SubQueryResult;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.expression.visitor.NotFromResolverVisitor;
+import com.lealone.sql.optimizer.IndexCondition;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Query;
 
 /**
  * An 'in' condition with a subquery, as in WHERE ID IN(SELECT ...)
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionNot.java b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionNot.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionNot.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionNot.java
index 4a094bd18..9d41e50c7 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/condition/ConditionNot.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/condition/ConditionNot.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.condition;
+package com.lealone.sql.expression.condition;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * A NOT condition.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java b/lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java
index 42e9a7d86..de37c5444 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/AlwaysTrueEvaluator.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.evaluator;
+package com.lealone.sql.expression.evaluator;
 
 //比如没有where条件时就用这个类
 public class AlwaysTrueEvaluator implements ExpressionEvaluator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/ExpressionEvaluator.java b/lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/ExpressionEvaluator.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/ExpressionEvaluator.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/ExpressionEvaluator.java
index 9b6584523..21c102bfb 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/ExpressionEvaluator.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/ExpressionEvaluator.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.evaluator;
+package com.lealone.sql.expression.evaluator;
 
 //可以解释执行表达式，也可以对表达式进行编译然后用生成的代码来执行
 public interface ExpressionEvaluator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/ExpressionInterpreter.java b/lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/ExpressionInterpreter.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/ExpressionInterpreter.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/ExpressionInterpreter.java
index a9981ad27..45247249b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/evaluator/ExpressionInterpreter.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/evaluator/ExpressionInterpreter.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.evaluator;
+package com.lealone.sql.expression.evaluator;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.Expression;
 
 //解释执行表达式
 public class ExpressionInterpreter implements ExpressionEvaluator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunction.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunction.java
index e2a28e768..c8c79b2f4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunction.java
@@ -3,23 +3,23 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * This class implements most built-in functions of this database.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunctionExt.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunctionExt.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunctionExt.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunctionExt.java
index cef1fd834..2469a3adb 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunctionExt.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunctionExt.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
-import org.lealone.db.Database;
+import com.lealone.db.Database;
 
 //其他数据库可以继承这个类把自己的专有函数变成lealone的内置函数
 public abstract class BuiltInFunctionExt extends BuiltInFunction {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunctionFactory.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunctionFactory.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunctionFactory.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunctionFactory.java
index 1b682cef1..d5f549e23 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/BuiltInFunctionFactory.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/BuiltInFunctionFactory.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
-import org.lealone.db.Database;
+import com.lealone.db.Database;
 
 public class BuiltInFunctionFactory implements FunctionFactory {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/DateTimeFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/DateTimeFunction.java
similarity index 95%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/DateTimeFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/DateTimeFunction.java
index dd4d1cadf..57ad889ba 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/DateTimeFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/DateTimeFunction.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.sql.Date;
 import java.sql.Time;
@@ -14,23 +14,23 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.DateTimeUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.Mode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTime;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.DateTimeUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.Mode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTime;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 /**
  * Implementation of the date and time functions.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/Function.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/Function.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/Function.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/Function.java
index b04853ecf..ceab0a8ca 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/Function.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/Function.java
@@ -3,18 +3,18 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.util.HashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Database;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Database;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.sql.expression.Expression;
 
 /**
  * This class is used by the built-in functions,
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionFactory.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionFactory.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionFactory.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionFactory.java
index f33ddd5b8..809d4d66b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionFactory.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionFactory.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
-import org.lealone.db.Database;
+import com.lealone.db.Database;
 
 public interface FunctionFactory {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionIndex.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionIndex.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionIndex.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionIndex.java
index c14a84ecd..722a26279 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionIndex.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionIndex.java
@@ -3,24 +3,24 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.IndexBase;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.IndexBase;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
 
 /**
  * An index for a function that returns a result set. This index can only scan
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionInfo.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionInfo.java
similarity index 95%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionInfo.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionInfo.java
index ed9826431..6542d779e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionInfo.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionInfo.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 /**
  * This class contains information about a built-in function.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionTable.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionTable.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionTable.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionTable.java
index 38d533949..e54541ebe 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/FunctionTable.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/FunctionTable.java
@@ -3,28 +3,28 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.table.TableType;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.sql.expression.Expression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.table.TableType;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.sql.expression.Expression;
 
 /**
  * A table backed by a system or user-defined function that returns a result set.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/JavaFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/JavaFunction.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/JavaFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/JavaFunction.java
index 4e919582d..8e8c830f9 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/JavaFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/JavaFunction.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
-
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Constants;
-import org.lealone.db.schema.FunctionAlias;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+package com.lealone.sql.expression.function;
+
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Constants;
+import com.lealone.db.schema.FunctionAlias;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * This class wraps a user-defined function.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/NumericFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/NumericFunction.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/NumericFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/NumericFunction.java
index 2b45dc7b7..082f5637d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/NumericFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/NumericFunction.java
@@ -3,31 +3,31 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.util.Calendar;
 
-import org.lealone.common.compress.CompressTool;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.security.BlockCipher;
-import org.lealone.common.security.CipherFactory;
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.DataUtils;
-import org.lealone.common.util.MathUtils;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+import com.lealone.common.compress.CompressTool;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.security.BlockCipher;
+import com.lealone.common.security.CipherFactory;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.DataUtils;
+import com.lealone.common.util.MathUtils;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 /**
  * Implementation of the numeric functions.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/StringFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/StringFunction.java
similarity index 97%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/StringFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/StringFunction.java
index 5fc0ce953..8141a7d24 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/StringFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/StringFunction.java
@@ -3,26 +3,26 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.util.regex.PatternSyntaxException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueBytes;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueBytes;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 /**
  * Implementation of the string functions.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/SystemFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/SystemFunction.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/SystemFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/SystemFunction.java
index 8a79719bd..f91c603e0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/SystemFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/SystemFunction.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,37 +13,37 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.JdbcUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Command;
-import org.lealone.db.Database;
-import org.lealone.db.Mode;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.schema.Sequence;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.util.Csv;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.db.value.ValueString;
-import org.lealone.sql.LealoneSQLParser;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.Variable;
-import org.lealone.storage.fs.FileUtils;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.JdbcUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Command;
+import com.lealone.db.Database;
+import com.lealone.db.Mode;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.schema.Sequence;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.util.Csv;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.db.value.ValueString;
+import com.lealone.sql.LealoneSQLParser;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.Variable;
+import com.lealone.storage.fs.FileUtils;
 
 /**
  * Implementation of the system functions.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/function/TableFunction.java b/lealone-sql/src/main/java/com/lealone/sql/expression/function/TableFunction.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/function/TableFunction.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/function/TableFunction.java
index 0ec487949..eca293655 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/function/TableFunction.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/function/TableFunction.java
@@ -3,28 +3,28 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.function;
+package com.lealone.sql.expression.function;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.SimpleResultSet;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.DataType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueResultSet;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.SimpleResultSet;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.DataType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueResultSet;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
 
 /**
  * Implementation of the functions TABLE(..) and TABLE_DISTINCT(..).
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQuery.java b/lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQuery.java
similarity index 85%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQuery.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQuery.java
index f26c67c26..e76a98fc3 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQuery.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQuery.java
@@ -3,21 +3,21 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.expression.subquery;
+package com.lealone.sql.expression.subquery;
 
 import java.util.ArrayList;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionList;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.query.Query;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionList;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.query.Query;
 
 /**
  * A query returning a single value.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQueryResult.java b/lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQueryResult.java
similarity index 86%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQueryResult.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQueryResult.java
index 980ec02bd..199a1940a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQueryResult.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQueryResult.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.subquery;
+package com.lealone.sql.expression.subquery;
 
 import java.util.ArrayList;
 
-import org.lealone.db.result.DelegatedResult;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.sql.query.Query;
+import com.lealone.db.result.DelegatedResult;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.sql.query.Query;
 
 public class SubQueryResult extends DelegatedResult {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQueryRowList.java b/lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQueryRowList.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQueryRowList.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQueryRowList.java
index be1a57ffe..47be70507 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/subquery/SubQueryRowList.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/subquery/SubQueryRowList.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.subquery;
+package com.lealone.sql.expression.subquery;
 
 import java.util.ArrayList;
 
-import org.lealone.db.result.DelegatedResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.value.Value;
+import com.lealone.db.result.DelegatedResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.value.Value;
 
 class SubQueryRowList extends DelegatedResult {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/BooleanExpressionVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/BooleanExpressionVisitor.java
similarity index 77%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/BooleanExpressionVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/BooleanExpressionVisitor.java
index 71471f8ef..efc32549b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/BooleanExpressionVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/BooleanExpressionVisitor.java
@@ -3,40 +3,40 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
 import java.util.ArrayList;
 
-import org.lealone.sql.expression.Alias;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ExpressionList;
-import org.lealone.sql.expression.Operation;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SelectOrderBy;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.Variable;
-import org.lealone.sql.expression.Wildcard;
-import org.lealone.sql.expression.aggregate.AGroupConcat;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.condition.CompareLike;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.condition.ConditionExists;
-import org.lealone.sql.expression.condition.ConditionIn;
-import org.lealone.sql.expression.condition.ConditionInConstantSet;
-import org.lealone.sql.expression.condition.ConditionInSelect;
-import org.lealone.sql.expression.condition.ConditionNot;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.JavaFunction;
-import org.lealone.sql.expression.function.TableFunction;
-import org.lealone.sql.expression.subquery.SubQuery;
-import org.lealone.sql.query.Query;
-import org.lealone.sql.query.Select;
-import org.lealone.sql.query.SelectUnion;
+import com.lealone.sql.expression.Alias;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ExpressionList;
+import com.lealone.sql.expression.Operation;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SelectOrderBy;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.Variable;
+import com.lealone.sql.expression.Wildcard;
+import com.lealone.sql.expression.aggregate.AGroupConcat;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.condition.CompareLike;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.condition.ConditionExists;
+import com.lealone.sql.expression.condition.ConditionIn;
+import com.lealone.sql.expression.condition.ConditionInConstantSet;
+import com.lealone.sql.expression.condition.ConditionInSelect;
+import com.lealone.sql.expression.condition.ConditionNot;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.JavaFunction;
+import com.lealone.sql.expression.function.TableFunction;
+import com.lealone.sql.expression.subquery.SubQuery;
+import com.lealone.sql.query.Query;
+import com.lealone.sql.query.Select;
+import com.lealone.sql.query.SelectUnion;
 
 public abstract class BooleanExpressionVisitor extends ExpressionVisitorBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ColumnsVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ColumnsVisitor.java
similarity index 78%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ColumnsVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ColumnsVisitor.java
index 5b9a378d7..2dd1f762d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ColumnsVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ColumnsVisitor.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
 import java.util.Set;
 
-import org.lealone.db.table.Column;
-import org.lealone.sql.expression.ExpressionColumn;
+import com.lealone.db.table.Column;
+import com.lealone.sql.expression.ExpressionColumn;
 
 public class ColumnsVisitor extends VoidExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/DependenciesVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/DependenciesVisitor.java
similarity index 79%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/DependenciesVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/DependenciesVisitor.java
index 307b0b7bf..d2796e57e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/DependenciesVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/DependenciesVisitor.java
@@ -3,18 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
 import java.util.Set;
 
-import org.lealone.db.DbObject;
-import org.lealone.db.table.Table;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.function.JavaFunction;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Query;
+import com.lealone.db.DbObject;
+import com.lealone.db.table.Table;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.function.JavaFunction;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Query;
 
 public class DependenciesVisitor extends VoidExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/DeterministicVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/DeterministicVisitor.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/DeterministicVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/DeterministicVisitor.java
index 33c61e8a3..978887374 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/DeterministicVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/DeterministicVisitor.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
-
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.Variable;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.query.Select;
+package com.lealone.sql.expression.visitor;
+
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.Variable;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.query.Select;
 
 public class DeterministicVisitor extends BooleanExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/EvaluatableVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/EvaluatableVisitor.java
similarity index 81%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/EvaluatableVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/EvaluatableVisitor.java
index fe5422c0d..e84ba8514 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/EvaluatableVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/EvaluatableVisitor.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.query.Select;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.query.Select;
 
 public class EvaluatableVisitor extends BooleanExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitor.java
new file mode 100644
index 000000000..815985d38
--- /dev/null
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitor.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright Lealone Database Group.
+ * Licensed under the Server Side Public License, v 1.
+ * Initial Developer: zhh
+ */
+package com.lealone.sql.expression.visitor;
+
+import com.lealone.sql.expression.Alias;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ExpressionList;
+import com.lealone.sql.expression.Operation;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.Variable;
+import com.lealone.sql.expression.Wildcard;
+import com.lealone.sql.expression.aggregate.AGroupConcat;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.condition.CompareLike;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.condition.ConditionExists;
+import com.lealone.sql.expression.condition.ConditionIn;
+import com.lealone.sql.expression.condition.ConditionInConstantSet;
+import com.lealone.sql.expression.condition.ConditionInSelect;
+import com.lealone.sql.expression.condition.ConditionNot;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.JavaFunction;
+import com.lealone.sql.expression.function.TableFunction;
+import com.lealone.sql.expression.subquery.SubQuery;
+import com.lealone.sql.query.Select;
+import com.lealone.sql.query.SelectUnion;
+
+public interface ExpressionVisitor {
+
+    public default ExpressionVisitor incrementQueryLevel(int offset) {
+        return this;
+    }
+
+    public default int getQueryLevel() {
+        return 0;
+    }
+
+    R visitExpression(Expression e);
+
+    R visitAlias(Alias e);
+
+    R visitExpressionColumn(ExpressionColumn e);
+
+    R visitExpressionList(ExpressionList e);
+
+    R visitOperation(Operation e);
+
+    R visitParameter(Parameter e);
+
+    R visitRownum(Rownum e);
+
+    R visitSequenceValue(SequenceValue e);
+
+    R visitSubQuery(SubQuery e);
+
+    R visitValueExpression(ValueExpression e);
+
+    R visitVariable(Variable e);
+
+    R visitWildcard(Wildcard e);
+
+    R visitCompareLike(CompareLike e);
+
+    R visitComparison(Comparison e);
+
+    R visitConditionAndOr(ConditionAndOr e);
+
+    R visitConditionExists(ConditionExists e);
+
+    R visitConditionIn(ConditionIn e);
+
+    R visitConditionInConstantSet(ConditionInConstantSet e);
+
+    R visitConditionInSelect(ConditionInSelect e);
+
+    R visitConditionNot(ConditionNot e);
+
+    R visitAggregate(Aggregate e);
+
+    R visitAGroupConcat(AGroupConcat e);
+
+    R visitJavaAggregate(JavaAggregate e);
+
+    R visitFunction(Function e);
+
+    R visitJavaFunction(JavaFunction e);
+
+    R visitTableFunction(TableFunction e);
+
+    R visitSelect(Select s);
+
+    R visitSelectUnion(SelectUnion su);
+}
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitorBase.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitorBase.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitorBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitorBase.java
index b11c17400..cb41a6821 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitorBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitorBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
 public abstract class ExpressionVisitorBase implements ExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitorFactory.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitorFactory.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitorFactory.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitorFactory.java
index dc21829c0..80ba6c9c5 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitorFactory.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/ExpressionVisitorFactory.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
 import java.util.Set;
 
-import org.lealone.db.DbObject;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.db.DbObject;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.sql.optimizer.ColumnResolver;
 
 public class ExpressionVisitorFactory {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/IndependentVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/IndependentVisitor.java
similarity index 72%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/IndependentVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/IndependentVisitor.java
index 18fcaed16..136cab18d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/IndependentVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/IndependentVisitor.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SequenceValue;
 
 public class IndependentVisitor extends BooleanExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/MapColumnsVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/MapColumnsVisitor.java
similarity index 81%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/MapColumnsVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/MapColumnsVisitor.java
index 0669e4eed..d188e3735 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/MapColumnsVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/MapColumnsVisitor.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.aggregate.AGroupConcat;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.condition.ConditionExists;
-import org.lealone.sql.expression.condition.ConditionIn;
-import org.lealone.sql.expression.condition.ConditionInConstantSet;
-import org.lealone.sql.expression.condition.ConditionInSelect;
-import org.lealone.sql.expression.subquery.SubQuery;
-import org.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.aggregate.AGroupConcat;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.condition.ConditionExists;
+import com.lealone.sql.expression.condition.ConditionIn;
+import com.lealone.sql.expression.condition.ConditionInConstantSet;
+import com.lealone.sql.expression.condition.ConditionInSelect;
+import com.lealone.sql.expression.subquery.SubQuery;
+import com.lealone.sql.optimizer.ColumnResolver;
 
 public class MapColumnsVisitor extends VoidExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/MaxModificationIdVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/MaxModificationIdVisitor.java
similarity index 84%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/MaxModificationIdVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/MaxModificationIdVisitor.java
index bc0da68da..fc9add227 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/MaxModificationIdVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/MaxModificationIdVisitor.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.optimizer.TableFilter;
-import org.lealone.sql.query.Query;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.optimizer.TableFilter;
+import com.lealone.sql.query.Query;
 
 public class MaxModificationIdVisitor extends VoidExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/NotFromResolverVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/NotFromResolverVisitor.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/NotFromResolverVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/NotFromResolverVisitor.java
index be103d3e2..b5defd07f 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/NotFromResolverVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/NotFromResolverVisitor.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.optimizer.ColumnResolver;
 
 public class NotFromResolverVisitor extends BooleanExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/OptimizableVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/OptimizableVisitor.java
similarity index 70%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/OptimizableVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/OptimizableVisitor.java
index 0a589d795..68afc0a9b 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/OptimizableVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/OptimizableVisitor.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
-
-import org.lealone.db.table.Table;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.BuiltInAggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
+package com.lealone.sql.expression.visitor;
+
+import com.lealone.db.table.Table;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.BuiltInAggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
 
 public class OptimizableVisitor extends BooleanExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/QueryComparableVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/QueryComparableVisitor.java
similarity index 73%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/QueryComparableVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/QueryComparableVisitor.java
index c9b007910..09ab644a0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/QueryComparableVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/QueryComparableVisitor.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.function.Function;
 
 public class QueryComparableVisitor extends BooleanExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/UpdateAggregateVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/UpdateAggregateVisitor.java
similarity index 73%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/UpdateAggregateVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/UpdateAggregateVisitor.java
index a94442448..caaaa7af0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/UpdateAggregateVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/UpdateAggregateVisitor.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.aggregate.AGroupConcat;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.aggregate.AGroupConcat;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
 
 public class UpdateAggregateVisitor extends VoidExpressionVisitor {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/VoidExpressionVisitor.java b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/VoidExpressionVisitor.java
similarity index 76%
rename from lealone-sql/src/main/java/org/lealone/sql/expression/visitor/VoidExpressionVisitor.java
rename to lealone-sql/src/main/java/com/lealone/sql/expression/visitor/VoidExpressionVisitor.java
index 1c71cb64f..ecf53710f 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/VoidExpressionVisitor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/expression/visitor/VoidExpressionVisitor.java
@@ -3,40 +3,40 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.expression.visitor;
+package com.lealone.sql.expression.visitor;
 
 import java.util.ArrayList;
 
-import org.lealone.sql.expression.Alias;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ExpressionList;
-import org.lealone.sql.expression.Operation;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SelectOrderBy;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.Variable;
-import org.lealone.sql.expression.Wildcard;
-import org.lealone.sql.expression.aggregate.AGroupConcat;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.condition.CompareLike;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.condition.ConditionExists;
-import org.lealone.sql.expression.condition.ConditionIn;
-import org.lealone.sql.expression.condition.ConditionInConstantSet;
-import org.lealone.sql.expression.condition.ConditionInSelect;
-import org.lealone.sql.expression.condition.ConditionNot;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.JavaFunction;
-import org.lealone.sql.expression.function.TableFunction;
-import org.lealone.sql.expression.subquery.SubQuery;
-import org.lealone.sql.query.Query;
-import org.lealone.sql.query.Select;
-import org.lealone.sql.query.SelectUnion;
+import com.lealone.sql.expression.Alias;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.ExpressionList;
+import com.lealone.sql.expression.Operation;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.Rownum;
+import com.lealone.sql.expression.SelectOrderBy;
+import com.lealone.sql.expression.SequenceValue;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.Variable;
+import com.lealone.sql.expression.Wildcard;
+import com.lealone.sql.expression.aggregate.AGroupConcat;
+import com.lealone.sql.expression.aggregate.Aggregate;
+import com.lealone.sql.expression.aggregate.JavaAggregate;
+import com.lealone.sql.expression.condition.CompareLike;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.condition.ConditionExists;
+import com.lealone.sql.expression.condition.ConditionIn;
+import com.lealone.sql.expression.condition.ConditionInConstantSet;
+import com.lealone.sql.expression.condition.ConditionInSelect;
+import com.lealone.sql.expression.condition.ConditionNot;
+import com.lealone.sql.expression.function.Function;
+import com.lealone.sql.expression.function.JavaFunction;
+import com.lealone.sql.expression.function.TableFunction;
+import com.lealone.sql.expression.subquery.SubQuery;
+import com.lealone.sql.query.Query;
+import com.lealone.sql.query.Select;
+import com.lealone.sql.query.SelectUnion;
 
 public class VoidExpressionVisitor extends ExpressionVisitorBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/operator/Operator.java b/lealone-sql/src/main/java/com/lealone/sql/operator/Operator.java
similarity index 82%
rename from lealone-sql/src/main/java/org/lealone/sql/operator/Operator.java
rename to lealone-sql/src/main/java/com/lealone/sql/operator/Operator.java
index 811aa242b..a2be91ad2 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/operator/Operator.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/operator/Operator.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.operator;
+package com.lealone.sql.operator;
 
-import org.lealone.db.result.LocalResult;
+import com.lealone.db.result.LocalResult;
 
 public interface Operator {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/operator/OperatorFactory.java b/lealone-sql/src/main/java/com/lealone/sql/operator/OperatorFactory.java
similarity index 70%
rename from lealone-sql/src/main/java/org/lealone/sql/operator/OperatorFactory.java
rename to lealone-sql/src/main/java/com/lealone/sql/operator/OperatorFactory.java
index 8e2cdc1cd..1e55f26f4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/operator/OperatorFactory.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/operator/OperatorFactory.java
@@ -3,11 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.operator;
+package com.lealone.sql.operator;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.result.LocalResult;
-import org.lealone.sql.query.Select;
+import com.lealone.db.Plugin;
+import com.lealone.db.result.LocalResult;
+import com.lealone.sql.query.Select;
 
 public interface OperatorFactory extends Plugin {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/operator/OperatorFactoryBase.java b/lealone-sql/src/main/java/com/lealone/sql/operator/OperatorFactoryBase.java
similarity index 80%
rename from lealone-sql/src/main/java/org/lealone/sql/operator/OperatorFactoryBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/operator/OperatorFactoryBase.java
index 15a32d425..ba8de61fe 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/operator/OperatorFactoryBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/operator/OperatorFactoryBase.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.operator;
+package com.lealone.sql.operator;
 
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
 
 public abstract class OperatorFactoryBase extends PluginBase implements OperatorFactory {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/AliasColumnResolver.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/AliasColumnResolver.java
similarity index 81%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/AliasColumnResolver.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/AliasColumnResolver.java
index e24b5086c..de6e0eed4 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/AliasColumnResolver.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/AliasColumnResolver.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.optimizer;
-
-import org.lealone.db.session.Session;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.query.Select;
+package com.lealone.sql.optimizer;
+
+import com.lealone.db.session.Session;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.query.Select;
 
 // 处理在where和having中出现别名的情况，如:
 // SELECT id AS A FROM test where A>=0
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/ColumnResolver.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/ColumnResolver.java
similarity index 87%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/ColumnResolver.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/ColumnResolver.java
index 99c6ccb5d..298c907fc 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/ColumnResolver.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/ColumnResolver.java
@@ -3,15 +3,15 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
-
-import org.lealone.db.session.Session;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.query.Select;
+package com.lealone.sql.optimizer;
+
+import com.lealone.db.session.Session;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.query.Select;
 
 /**
  * A column resolver is list of column (for example, a table) that can map a
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/ColumnResolverBase.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/ColumnResolverBase.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/ColumnResolverBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/ColumnResolverBase.java
index 67dca718a..8af6ba5c1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/ColumnResolverBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/ColumnResolverBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
 public abstract class ColumnResolverBase implements ColumnResolver {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/IndexCondition.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/IndexCondition.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/IndexCondition.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/IndexCondition.java
index dc8b03f0a..6d8ae823e 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/IndexCondition.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/IndexCondition.java
@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,20 +11,20 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.db.index.IndexConditionType;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.TableType;
-import org.lealone.db.value.CompareMode;
-import org.lealone.db.value.Value;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.query.Query;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.db.index.IndexConditionType;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.TableType;
+import com.lealone.db.value.CompareMode;
+import com.lealone.db.value.Value;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.query.Query;
 
 /**
  * A index condition object is made for each condition that can potentially use
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/IndexCursor.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/IndexCursor.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/IndexCursor.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/IndexCursor.java
index d0caf87e4..d9c225e31 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/IndexCursor.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/IndexCursor.java
@@ -3,26 +3,26 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.query.Select;
-import org.lealone.storage.CursorParameters;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.query.Select;
+import com.lealone.storage.CursorParameters;
 
 /**
  * The filter used to walk through an index. This class supports IN(..)
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/Optimizer.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/Optimizer.java
similarity index 97%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/Optimizer.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/Optimizer.java
index 915edea3f..cf7fcfa4d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/Optimizer.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/Optimizer.java
@@ -3,16 +3,16 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.lealone.common.util.BitField;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
+import com.lealone.common.util.BitField;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
 
 /**
  * The optimizer is responsible to find the best execution plan
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/Permutations.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/Permutations.java
similarity index 98%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/Permutations.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/Permutations.java
index fedcf16b9..c0b000387 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/Permutations.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/Permutations.java
@@ -18,9 +18,9 @@
  * diligence.
  * -Alan
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
-import org.lealone.common.exceptions.DbException;
+import com.lealone.common.exceptions.DbException;
 
 /**
  * A class to iterate over all permutations of an array.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/Plan.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/Plan.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/Plan.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/Plan.java
index a17e654ed..37bbdb8c0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/Plan.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/Plan.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.expression.Expression;
 
 /**
  * A possible query execution plan. The time required to execute a query depends
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/PlanItem.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/PlanItem.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/PlanItem.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/PlanItem.java
index 7b7c45e6b..bc868869a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/PlanItem.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/PlanItem.java
@@ -3,9 +3,9 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
-import org.lealone.db.index.Index;
+import com.lealone.db.index.Index;
 
 /**
  * The plan item describes the index to be used, and the estimated cost when using it.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/SingleColumnResolver.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/SingleColumnResolver.java
similarity index 83%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/SingleColumnResolver.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/SingleColumnResolver.java
index 4d6815d70..b4a8d222f 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/SingleColumnResolver.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/SingleColumnResolver.java
@@ -3,13 +3,13 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
-import org.lealone.db.session.Session;
-import org.lealone.db.table.Column;
-import org.lealone.db.value.Value;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.query.Select;
+import com.lealone.db.session.Session;
+import com.lealone.db.table.Column;
+import com.lealone.db.value.Value;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.query.Select;
 
 /**
  * The single column resolver is like a table with exactly one row.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/TableFilter.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/TableFilter.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/TableFilter.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/TableFilter.java
index 1fea5da66..06408c32a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/TableFilter.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/TableFilter.java
@@ -3,35 +3,35 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.SysProperties;
-import org.lealone.db.auth.Right;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.session.Session;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.IExpression;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.query.Select;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.SysProperties;
+import com.lealone.db.auth.Right;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.session.Session;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.IExpression;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.query.Select;
 
 /**
  * A table filter represents a table that is used in a query. There is one such
@@ -980,7 +980,7 @@ public interface TableFilterVisitor {
     @Override
     public Value getExpressionValue(Session session, IExpression e, Object data) {
         setSession((ServerSession) session);
-        set((org.lealone.db.result.Row) data);
+        set((com.lealone.db.result.Row) data);
         return e.getValue(session);
     }
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/optimizer/TableIterator.java b/lealone-sql/src/main/java/com/lealone/sql/optimizer/TableIterator.java
similarity index 90%
rename from lealone-sql/src/main/java/org/lealone/sql/optimizer/TableIterator.java
rename to lealone-sql/src/main/java/com/lealone/sql/optimizer/TableIterator.java
index 77336fc00..fba29ff65 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/optimizer/TableIterator.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/optimizer/TableIterator.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.optimizer;
+package com.lealone.sql.optimizer;
 
-import org.lealone.db.index.Cursor;
-import org.lealone.db.result.Row;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.result.Row;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
 
 public class TableIterator {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QAggregate.java b/lealone-sql/src/main/java/com/lealone/sql/query/QAggregate.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QAggregate.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QAggregate.java
index b8e827ddc..797972776 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QAggregate.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QAggregate.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.HashMap;
 
-import org.lealone.db.value.Value;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.value.Value;
+import com.lealone.sql.expression.Expression;
 
 // 除了QuickAggregateQuery之外的聚合函数，没有group by
 class QAggregate extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QAggregateQuick.java b/lealone-sql/src/main/java/com/lealone/sql/query/QAggregateQuick.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QAggregateQuick.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QAggregateQuick.java
index f2400b637..4ebc7a5bb 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QAggregateQuick.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QAggregateQuick.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 // 对min、max、count三个聚合函数的特殊优化
 class QAggregateQuick extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QCache.java b/lealone-sql/src/main/java/com/lealone/sql/query/QCache.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QCache.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QCache.java
index f03fd556a..ad6241704 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QCache.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QCache.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.result.LocalResult;
+import com.lealone.db.result.LocalResult;
 
 // 直接基于缓存中的结果集
 class QCache extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QDistinct.java b/lealone-sql/src/main/java/com/lealone/sql/query/QDistinct.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QDistinct.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QDistinct.java
index 357cc7a3c..f1bc2320d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QDistinct.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QDistinct.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.index.Cursor;
-import org.lealone.db.index.Index;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.value.Value;
+import com.lealone.db.index.Cursor;
+import com.lealone.db.index.Index;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.value.Value;
 
 // 单字段/多字段distinct
 class QDistinct extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QEmpty.java b/lealone-sql/src/main/java/com/lealone/sql/query/QEmpty.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QEmpty.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QEmpty.java
index f1f4ade84..8dcb35a38 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QEmpty.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QEmpty.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 // 比如limit子句为0时
 class QEmpty extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QFlat.java b/lealone-sql/src/main/java/com/lealone/sql/query/QFlat.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QFlat.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QFlat.java
index 58b42fd1c..7231e6c36 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QFlat.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QFlat.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 // 最普通的查询
 class QFlat extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QGroup.java b/lealone-sql/src/main/java/com/lealone/sql/query/QGroup.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QGroup.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QGroup.java
index 1249b81cd..1e75cbd3f 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QGroup.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QGroup.java
@@ -3,17 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.Arrays;
 import java.util.HashMap;
 
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.util.ValueHashMap;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.expression.Expression;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.util.ValueHashMap;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.expression.Expression;
 
 // 只处理group by，且group by的字段没有索引
 public class QGroup extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QGroupSorted.java b/lealone-sql/src/main/java/com/lealone/sql/query/QGroupSorted.java
similarity index 96%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QGroupSorted.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QGroupSorted.java
index cb69e2579..4e75cbcac 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QGroupSorted.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QGroupSorted.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.Arrays;
 import java.util.HashMap;
 
-import org.lealone.db.value.Value;
+import com.lealone.db.value.Value;
 
 // 只处理group by，且group by的字段有对应的索引
 public class QGroupSorted extends QOperator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QOperator.java b/lealone-sql/src/main/java/com/lealone/sql/query/QOperator.java
similarity index 89%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QOperator.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QOperator.java
index 6d8c54dae..89afc1a0d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QOperator.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QOperator.java
@@ -3,19 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
-
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.evaluator.AlwaysTrueEvaluator;
-import org.lealone.sql.expression.evaluator.ExpressionEvaluator;
-import org.lealone.sql.expression.evaluator.ExpressionInterpreter;
-import org.lealone.sql.operator.Operator;
-import org.lealone.sql.optimizer.TableIterator;
+package com.lealone.sql.query;
+
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.evaluator.AlwaysTrueEvaluator;
+import com.lealone.sql.expression.evaluator.ExpressionEvaluator;
+import com.lealone.sql.expression.evaluator.ExpressionInterpreter;
+import com.lealone.sql.operator.Operator;
+import com.lealone.sql.optimizer.TableIterator;
 
 // 由子类实现具体的查询操作
 public abstract class QOperator implements Operator {
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/Query.java b/lealone-sql/src/main/java/com/lealone/sql/query/Query.java
similarity index 91%
rename from lealone-sql/src/main/java/org/lealone/sql/query/Query.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/Query.java
index faa552433..8f8767449 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/Query.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/Query.java
@@ -3,47 +3,47 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.CommandParameter;
-import org.lealone.db.Database;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.index.IndexConditionType;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.dml.ManipulationStatement;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.expression.Alias;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.SelectOrderBy;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.expression.visitor.MaxModificationIdVisitor;
-import org.lealone.sql.optimizer.ColumnResolver;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.CommandParameter;
+import com.lealone.db.Database;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.index.IndexConditionType;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.dml.ManipulationStatement;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.expression.Alias;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.SelectOrderBy;
+import com.lealone.sql.expression.ValueExpression;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.expression.visitor.MaxModificationIdVisitor;
+import com.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * Represents a SELECT statement (simple, or union).
  */
-public abstract class Query extends ManipulationStatement implements org.lealone.sql.IQuery {
+public abstract class Query extends ManipulationStatement implements com.lealone.sql.IQuery {
 
     /**
      * The limit expression as specified in the LIMIT or TOP clause.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/QueryResultCache.java b/lealone-sql/src/main/java/com/lealone/sql/query/QueryResultCache.java
similarity index 92%
rename from lealone-sql/src/main/java/org/lealone/sql/query/QueryResultCache.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/QueryResultCache.java
index 9b6913d1b..8883619be 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/QueryResultCache.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/QueryResultCache.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.ArrayList;
 
-import org.lealone.db.Database;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.value.Value;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.db.Database;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.value.Value;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
 
 class QueryResultCache {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/Select.java b/lealone-sql/src/main/java/com/lealone/sql/query/Select.java
similarity index 95%
rename from lealone-sql/src/main/java/org/lealone/sql/query/Select.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/Select.java
index 1ee8cc6b4..84489d10a 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/Select.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/Select.java
@@ -3,51 +3,51 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StatementBuilder;
-import org.lealone.common.util.StringUtils;
-import org.lealone.common.util.Utils;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.async.Future;
-import org.lealone.db.index.Index;
-import org.lealone.db.index.IndexColumn;
-import org.lealone.db.index.IndexType;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.SelectOrderBy;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.expression.visitor.ExpressionVisitorFactory;
-import org.lealone.sql.optimizer.ColumnResolver;
-import org.lealone.sql.optimizer.Optimizer;
-import org.lealone.sql.optimizer.PlanItem;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StatementBuilder;
+import com.lealone.common.util.StringUtils;
+import com.lealone.common.util.Utils;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.async.Future;
+import com.lealone.db.index.Index;
+import com.lealone.db.index.IndexColumn;
+import com.lealone.db.index.IndexType;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.SelectOrderBy;
+import com.lealone.sql.expression.condition.Comparison;
+import com.lealone.sql.expression.condition.ConditionAndOr;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.expression.visitor.ExpressionVisitorFactory;
+import com.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.sql.optimizer.Optimizer;
+import com.lealone.sql.optimizer.PlanItem;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * This class represents a simple SELECT statement.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/SelectUnion.java b/lealone-sql/src/main/java/com/lealone/sql/query/SelectUnion.java
similarity index 88%
rename from lealone-sql/src/main/java/org/lealone/sql/query/SelectUnion.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/SelectUnion.java
index 754d384f0..867aaa27d 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/SelectUnion.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/SelectUnion.java
@@ -3,36 +3,36 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.SysProperties;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.async.Future;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.db.value.Value;
-import org.lealone.sql.ISelectUnion;
-import org.lealone.sql.PreparedSQLStatement;
-import org.lealone.sql.SQLStatement;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.visitor.ExpressionVisitor;
-import org.lealone.sql.optimizer.ColumnResolver;
-import org.lealone.sql.optimizer.TableFilter;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.SysProperties;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.async.Future;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.db.value.Value;
+import com.lealone.sql.ISelectUnion;
+import com.lealone.sql.PreparedSQLStatement;
+import com.lealone.sql.SQLStatement;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ExpressionColumn;
+import com.lealone.sql.expression.Parameter;
+import com.lealone.sql.expression.visitor.ExpressionVisitor;
+import com.lealone.sql.optimizer.ColumnResolver;
+import com.lealone.sql.optimizer.TableFilter;
 
 /**
  * Represents a union SELECT statement.
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableLocalQuery.java b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableLocalQuery.java
similarity index 74%
rename from lealone-sql/src/main/java/org/lealone/sql/query/YieldableLocalQuery.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/YieldableLocalQuery.java
index 9dfee81b8..702843514 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableLocalQuery.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableLocalQuery.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.sql.StatementBase;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.sql.StatementBase;
 
 public class YieldableLocalQuery extends YieldableQueryBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableQueryBase.java b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableQueryBase.java
similarity index 69%
rename from lealone-sql/src/main/java/org/lealone/sql/query/YieldableQueryBase.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/YieldableQueryBase.java
index 0aa833663..5b6dd74e1 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableQueryBase.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableQueryBase.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.result.Result;
-import org.lealone.sql.StatementBase;
-import org.lealone.sql.executor.YieldableBase;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.result.Result;
+import com.lealone.sql.StatementBase;
+import com.lealone.sql.executor.YieldableBase;
 
 public abstract class YieldableQueryBase extends YieldableBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableSelect.java b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableSelect.java
similarity index 93%
rename from lealone-sql/src/main/java/org/lealone/sql/query/YieldableSelect.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/YieldableSelect.java
index c3e2c2d50..64ad24691 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableSelect.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableSelect.java
@@ -3,20 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.db.PluginManager;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.lock.DbObjectLock;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.operator.Operator;
-import org.lealone.sql.operator.OperatorFactory;
+import com.lealone.db.PluginManager;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.lock.DbObjectLock;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.operator.Operator;
+import com.lealone.sql.operator.OperatorFactory;
 
 public class YieldableSelect extends YieldableQueryBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableSelectUnion.java b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableSelectUnion.java
similarity index 94%
rename from lealone-sql/src/main/java/org/lealone/sql/query/YieldableSelectUnion.java
rename to lealone-sql/src/main/java/com/lealone/sql/query/YieldableSelectUnion.java
index 6172a196d..c928003b0 100644
--- a/lealone-sql/src/main/java/org/lealone/sql/query/YieldableSelectUnion.java
+++ b/lealone-sql/src/main/java/com/lealone/sql/query/YieldableSelectUnion.java
@@ -3,21 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.sql.query;
+package com.lealone.sql.query;
 
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.async.AsyncHandler;
-import org.lealone.db.async.AsyncResult;
-import org.lealone.db.result.LocalResult;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.ResultTarget;
-import org.lealone.db.session.SessionStatus;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueNull;
-import org.lealone.sql.executor.YieldableBase;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ValueExpression;
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.async.AsyncHandler;
+import com.lealone.db.async.AsyncResult;
+import com.lealone.db.result.LocalResult;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.ResultTarget;
+import com.lealone.db.session.SessionStatus;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueNull;
+import com.lealone.sql.executor.YieldableBase;
+import com.lealone.sql.expression.Expression;
+import com.lealone.sql.expression.ValueExpression;
 
 class YieldableSelectUnion extends YieldableQueryBase {
 
diff --git a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitor.java b/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitor.java
deleted file mode 100644
index 7913228ed..000000000
--- a/lealone-sql/src/main/java/org/lealone/sql/expression/visitor/ExpressionVisitor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright Lealone Database Group.
- * Licensed under the Server Side Public License, v 1.
- * Initial Developer: zhh
- */
-package org.lealone.sql.expression.visitor;
-
-import org.lealone.sql.expression.Alias;
-import org.lealone.sql.expression.Expression;
-import org.lealone.sql.expression.ExpressionColumn;
-import org.lealone.sql.expression.ExpressionList;
-import org.lealone.sql.expression.Operation;
-import org.lealone.sql.expression.Parameter;
-import org.lealone.sql.expression.Rownum;
-import org.lealone.sql.expression.SequenceValue;
-import org.lealone.sql.expression.ValueExpression;
-import org.lealone.sql.expression.Variable;
-import org.lealone.sql.expression.Wildcard;
-import org.lealone.sql.expression.aggregate.AGroupConcat;
-import org.lealone.sql.expression.aggregate.Aggregate;
-import org.lealone.sql.expression.aggregate.JavaAggregate;
-import org.lealone.sql.expression.condition.CompareLike;
-import org.lealone.sql.expression.condition.Comparison;
-import org.lealone.sql.expression.condition.ConditionAndOr;
-import org.lealone.sql.expression.condition.ConditionExists;
-import org.lealone.sql.expression.condition.ConditionIn;
-import org.lealone.sql.expression.condition.ConditionInConstantSet;
-import org.lealone.sql.expression.condition.ConditionInSelect;
-import org.lealone.sql.expression.condition.ConditionNot;
-import org.lealone.sql.expression.function.Function;
-import org.lealone.sql.expression.function.JavaFunction;
-import org.lealone.sql.expression.function.TableFunction;
-import org.lealone.sql.expression.subquery.SubQuery;
-import org.lealone.sql.query.Select;
-import org.lealone.sql.query.SelectUnion;
-
-public interface ExpressionVisitor {
-
-    public default ExpressionVisitor incrementQueryLevel(int offset) {
-        return this;
-    }
-
-    public default int getQueryLevel() {
-        return 0;
-    }
-
-    R visitExpression(Expression e);
-
-    R visitAlias(Alias e);
-
-    R visitExpressionColumn(ExpressionColumn e);
-
-    R visitExpressionList(ExpressionList e);
-
-    R visitOperation(Operation e);
-
-    R visitParameter(Parameter e);
-
-    R visitRownum(Rownum e);
-
-    R visitSequenceValue(SequenceValue e);
-
-    R visitSubQuery(SubQuery e);
-
-    R visitValueExpression(ValueExpression e);
-
-    R visitVariable(Variable e);
-
-    R visitWildcard(Wildcard e);
-
-    R visitCompareLike(CompareLike e);
-
-    R visitComparison(Comparison e);
-
-    R visitConditionAndOr(ConditionAndOr e);
-
-    R visitConditionExists(ConditionExists e);
-
-    R visitConditionIn(ConditionIn e);
-
-    R visitConditionInConstantSet(ConditionInConstantSet e);
-
-    R visitConditionInSelect(ConditionInSelect e);
-
-    R visitConditionNot(ConditionNot e);
-
-    R visitAggregate(Aggregate e);
-
-    R visitAGroupConcat(AGroupConcat e);
-
-    R visitJavaAggregate(JavaAggregate e);
-
-    R visitFunction(Function e);
-
-    R visitJavaFunction(JavaFunction e);
-
-    R visitTableFunction(TableFunction e);
-
-    R visitSelect(Select s);
-
-    R visitSelectUnion(SelectUnion su);
-}
diff --git a/lealone-sql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine b/lealone-sql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine
new file mode 100644
index 000000000..e4e0419f1
--- /dev/null
+++ b/lealone-sql/src/main/resources/META-INF/services/com.lealone.sql.SQLEngine
@@ -0,0 +1 @@
+com.lealone.sql.LealoneSQLEngine
\ No newline at end of file
diff --git a/lealone-sql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine b/lealone-sql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine
deleted file mode 100644
index f50b476ce..000000000
--- a/lealone-sql/src/main/resources/META-INF/services/org.lealone.sql.SQLEngine
+++ /dev/null
@@ -1 +0,0 @@
-org.lealone.sql.LealoneSQLEngine
diff --git a/lealone-test/pom.xml b/lealone-test/pom.xml
index ba358322d..e79f37a44 100644
--- a/lealone-test/pom.xml
+++ b/lealone-test/pom.xml
@@ -7,7 +7,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     4.0.0
     
-        org.lealone
+        com.lealone
         lealone
         6.0.0-SNAPSHOT
         ../pom.xml
@@ -19,7 +19,7 @@
 
     
         
-            org.lealone
+            com.lealone
             lealone-main
             ${project.version}
         
diff --git a/lealone-test/src/test/java/org/lealone/test/LealoneStart.java b/lealone-test/src/test/java/com/lealone/test/LealoneStart.java
similarity index 89%
rename from lealone-test/src/test/java/org/lealone/test/LealoneStart.java
rename to lealone-test/src/test/java/com/lealone/test/LealoneStart.java
index 78f64c0d2..b5f2f1226 100644
--- a/lealone-test/src/test/java/org/lealone/test/LealoneStart.java
+++ b/lealone-test/src/test/java/com/lealone/test/LealoneStart.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test;
+package com.lealone.test;
 
-import org.lealone.main.Lealone;
+import com.lealone.main.Lealone;
 
 public class LealoneStart {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/TestBase.java b/lealone-test/src/test/java/com/lealone/test/TestBase.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/TestBase.java
rename to lealone-test/src/test/java/com/lealone/test/TestBase.java
index 44c75ec06..8af9d3ae6 100644
--- a/lealone-test/src/test/java/org/lealone/test/TestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/TestBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test;
+package com.lealone.test;
 
 import java.io.File;
 import java.sql.Connection;
@@ -14,16 +14,17 @@
 import java.util.Map;
 
 import org.junit.Assert;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.logging.LoggerFactory;
-import org.lealone.common.logging.impl.ConsoleLoggerFactory;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.Constants;
-import org.lealone.db.DbSetting;
-import org.lealone.db.SysProperties;
-import org.lealone.main.config.Config;
-import org.lealone.storage.fs.FileUtils;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.logging.LoggerFactory;
+import com.lealone.common.logging.impl.ConsoleLoggerFactory;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.Constants;
+import com.lealone.db.DbSetting;
+import com.lealone.db.SysProperties;
+import com.lealone.main.config.Config;
+import com.lealone.storage.fs.FileUtils;
 
 public class TestBase extends Assert {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/UnitTestBase.java b/lealone-test/src/test/java/com/lealone/test/UnitTestBase.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/UnitTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/UnitTestBase.java
index 4286d4b66..c04add579 100644
--- a/lealone-test/src/test/java/org/lealone/test/UnitTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/UnitTestBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test;
+package com.lealone.test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -76,7 +76,7 @@ public void runTest(boolean isEmbeddedMemoryMode) {
             setEmbedded(true);
             setInMemory(true);
         }
-        System.setProperty(org.lealone.db.Constants.JDBC_URL_KEY, getURL());
+        System.setProperty(com.lealone.db.Constants.JDBC_URL_KEY, getURL());
         try {
             test();
         } catch (Exception e) {
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/AOStorageEngineTest.java b/lealone-test/src/test/java/com/lealone/test/aose/AOStorageEngineTest.java
similarity index 74%
rename from lealone-test/src/test/java/org/lealone/test/aose/AOStorageEngineTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/AOStorageEngineTest.java
index 746828bf8..269cdb15a 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/AOStorageEngineTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/AOStorageEngineTest.java
@@ -3,17 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.db.PluginManager;
-import org.lealone.storage.Storage;
-import org.lealone.storage.StorageBuilder;
-import org.lealone.storage.StorageEngine;
-import org.lealone.storage.aose.AOStorageBuilder;
-import org.lealone.storage.aose.AOStorageEngine;
-import org.lealone.storage.aose.lob.LobStreamStorage;
-import org.lealone.storage.lob.LobStorage;
+
+import com.lealone.db.PluginManager;
+import com.lealone.storage.Storage;
+import com.lealone.storage.StorageBuilder;
+import com.lealone.storage.StorageEngine;
+import com.lealone.storage.aose.AOStorageBuilder;
+import com.lealone.storage.aose.AOStorageEngine;
+import com.lealone.storage.aose.lob.LobStreamStorage;
+import com.lealone.storage.lob.LobStorage;
 
 public class AOStorageEngineTest extends AoseTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/AOStorageTest.java b/lealone-test/src/test/java/com/lealone/test/aose/AOStorageTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/aose/AOStorageTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/AOStorageTest.java
index 7dd91fa77..c39f597e8 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/AOStorageTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/AOStorageTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.storage.aose.AOStorageBuilder;
-import org.lealone.storage.aose.btree.BTreeMap;
-import org.lealone.storage.fs.FilePath;
+
+import com.lealone.storage.aose.AOStorageBuilder;
+import com.lealone.storage.aose.btree.BTreeMap;
+import com.lealone.storage.fs.FilePath;
 
 public class AOStorageTest extends AoseTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/AoseTestBase.java b/lealone-test/src/test/java/com/lealone/test/aose/AoseTestBase.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/aose/AoseTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/aose/AoseTestBase.java
index 5dbe1d093..0cf51f5e2 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/AoseTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/AoseTestBase.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.lealone.storage.StorageMapCursor;
-import org.lealone.storage.aose.AOStorage;
-import org.lealone.storage.aose.AOStorageBuilder;
-import org.lealone.storage.aose.btree.BTreeMap;
-import org.lealone.test.TestBase;
+import com.lealone.storage.StorageMapCursor;
+import com.lealone.storage.aose.AOStorage;
+import com.lealone.storage.aose.AOStorageBuilder;
+import com.lealone.storage.aose.btree.BTreeMap;
+import com.lealone.test.TestBase;
 
 public abstract class AoseTestBase extends TestBase implements TestBase.EmbeddedTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/BTreeGCTest.java b/lealone-test/src/test/java/com/lealone/test/aose/BTreeGCTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/aose/BTreeGCTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/BTreeGCTest.java
index 62440665b..83630693d 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/BTreeGCTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/BTreeGCTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 public class BTreeGCTest extends AoseTestBase {
     // @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/BTreeMapTest.java b/lealone-test/src/test/java/com/lealone/test/aose/BTreeMapTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/aose/BTreeMapTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/BTreeMapTest.java
index 88952744d..c47a53f7c 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/BTreeMapTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/BTreeMapTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Test;
-import org.lealone.db.value.ValueLong;
-import org.lealone.storage.StorageMapCursor;
-import org.lealone.storage.aose.btree.BTreeMap;
+
+import com.lealone.db.value.ValueLong;
+import com.lealone.storage.StorageMapCursor;
+import com.lealone.storage.aose.btree.BTreeMap;
 
 // -Xms800M -Xmx800M -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
 public class BTreeMapTest extends AoseTestBase {
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/BTreeStorageTest.java b/lealone-test/src/test/java/com/lealone/test/aose/BTreeStorageTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/aose/BTreeStorageTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/BTreeStorageTest.java
index acbdebd31..967a05a87 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/BTreeStorageTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/BTreeStorageTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/CompactTest.java b/lealone-test/src/test/java/com/lealone/test/aose/CompactTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/aose/CompactTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/CompactTest.java
index 7b070518e..40313b5a2 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/CompactTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/CompactTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/ConcurrentStorageMapTest.java b/lealone-test/src/test/java/com/lealone/test/aose/ConcurrentStorageMapTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/aose/ConcurrentStorageMapTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/ConcurrentStorageMapTest.java
index 08ed5ba2e..d26c31563 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/ConcurrentStorageMapTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/ConcurrentStorageMapTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.storage.StorageMap;
+
+import com.lealone.storage.StorageMap;
 
 public class ConcurrentStorageMapTest extends AoseTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/FlushDirtyPageTest.java b/lealone-test/src/test/java/com/lealone/test/aose/FlushDirtyPageTest.java
similarity index 99%
rename from lealone-test/src/test/java/org/lealone/test/aose/FlushDirtyPageTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/FlushDirtyPageTest.java
index 177121c02..507b95a91 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/FlushDirtyPageTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/FlushDirtyPageTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/LobStorageTest.java b/lealone-test/src/test/java/com/lealone/test/aose/LobStorageTest.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/aose/LobStorageTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/LobStorageTest.java
index 9f2c44bdc..d3da419f1 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/LobStorageTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/LobStorageTest.java
@@ -3,17 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import java.io.InputStream;
 import java.io.StringReader;
 
 import org.junit.Test;
-import org.lealone.common.util.IOUtils;
-import org.lealone.db.LocalDataHandler;
-import org.lealone.db.value.ValueLob;
-import org.lealone.storage.aose.AOStorage;
-import org.lealone.storage.aose.lob.LobStreamStorage;
+
+import com.lealone.common.util.IOUtils;
+import com.lealone.db.LocalDataHandler;
+import com.lealone.db.value.ValueLob;
+import com.lealone.storage.aose.AOStorage;
+import com.lealone.storage.aose.lob.LobStreamStorage;
 
 public class LobStorageTest extends AoseTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/MemoryStorageTest.java b/lealone-test/src/test/java/com/lealone/test/aose/MemoryStorageTest.java
similarity index 80%
rename from lealone-test/src/test/java/org/lealone/test/aose/MemoryStorageTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/MemoryStorageTest.java
index ada7c0906..7fc05d19d 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/MemoryStorageTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/MemoryStorageTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.test.TestBase;
-import org.lealone.test.misc.CRUDExample;
+
+import com.lealone.test.TestBase;
+import com.lealone.test.misc.CRUDExample;
 
 public class MemoryStorageTest extends AoseTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/PageOperationTest.java b/lealone-test/src/test/java/com/lealone/test/aose/PageOperationTest.java
similarity index 99%
rename from lealone-test/src/test/java/org/lealone/test/aose/PageOperationTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/PageOperationTest.java
index 06789b637..d45761e2c 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/PageOperationTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/PageOperationTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import java.util.concurrent.CountDownLatch;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/PageStorageModeSqlTest.java b/lealone-test/src/test/java/com/lealone/test/aose/PageStorageModeSqlTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/aose/PageStorageModeSqlTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/PageStorageModeSqlTest.java
index 935db1a6b..cc7abf515 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/PageStorageModeSqlTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/PageStorageModeSqlTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.storage.aose.AOStorageEngine;
-import org.lealone.storage.aose.btree.page.PageStorageMode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.storage.aose.AOStorageEngine;
+import com.lealone.storage.aose.btree.page.PageStorageMode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class PageStorageModeSqlTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/PageStorageModeTest.java b/lealone-test/src/test/java/com/lealone/test/aose/PageStorageModeTest.java
similarity index 82%
rename from lealone-test/src/test/java/org/lealone/test/aose/PageStorageModeTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/PageStorageModeTest.java
index 913ca7b1c..31f1d3815 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/PageStorageModeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/PageStorageModeTest.java
@@ -3,23 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.db.index.standard.ValueDataType;
-import org.lealone.db.index.standard.VersionedValue;
-import org.lealone.db.index.standard.VersionedValueType;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueString;
-import org.lealone.storage.CursorParameters;
-import org.lealone.storage.StorageMap;
-import org.lealone.storage.StorageMapCursor;
-import org.lealone.storage.aose.AOStorage;
-import org.lealone.storage.aose.btree.BTreeMap;
-import org.lealone.storage.aose.btree.page.PageStorageMode;
-import org.lealone.transaction.aote.TransactionalValue;
-import org.lealone.transaction.aote.TransactionalValueType;
+
+import com.lealone.db.index.standard.ValueDataType;
+import com.lealone.db.index.standard.VersionedValue;
+import com.lealone.db.index.standard.VersionedValueType;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueString;
+import com.lealone.storage.CursorParameters;
+import com.lealone.storage.StorageMap;
+import com.lealone.storage.StorageMapCursor;
+import com.lealone.storage.aose.AOStorage;
+import com.lealone.storage.aose.btree.BTreeMap;
+import com.lealone.storage.aose.btree.page.PageStorageMode;
+import com.lealone.transaction.aote.TransactionalValue;
+import com.lealone.transaction.aote.TransactionalValueType;
 
 public class PageStorageModeTest extends AoseTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/PageUtilsTest.java b/lealone-test/src/test/java/com/lealone/test/aose/PageUtilsTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/aose/PageUtilsTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/PageUtilsTest.java
index ba343805b..cbcae3197 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/PageUtilsTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/PageUtilsTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.storage.aose.btree.page.PageUtils;
+
+import com.lealone.storage.aose.btree.page.PageUtils;
 
 public class PageUtilsTest extends AoseTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aose/StorageSqlTest.java b/lealone-test/src/test/java/com/lealone/test/aose/StorageSqlTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/aose/StorageSqlTest.java
rename to lealone-test/src/test/java/com/lealone/test/aose/StorageSqlTest.java
index ff9ce08f5..a9a33a557 100644
--- a/lealone-test/src/test/java/org/lealone/test/aose/StorageSqlTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aose/StorageSqlTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aose;
+package com.lealone.test.aose;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class StorageSqlTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/AoteTestBase.java b/lealone-test/src/test/java/com/lealone/test/aote/AoteTestBase.java
similarity index 89%
rename from lealone-test/src/test/java/org/lealone/test/aote/AoteTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/aote/AoteTestBase.java
index 0fc425523..9f56ea91c 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/AoteTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/AoteTestBase.java
@@ -3,19 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.BeforeClass;
-import org.lealone.db.Constants;
-import org.lealone.storage.Storage;
-import org.lealone.storage.StorageBuilder;
-import org.lealone.storage.StorageEngine;
-import org.lealone.test.TestBase;
-import org.lealone.transaction.TransactionEngine;
-import org.lealone.transaction.aote.log.LogSyncService;
+
+import com.lealone.db.Constants;
+import com.lealone.storage.Storage;
+import com.lealone.storage.StorageBuilder;
+import com.lealone.storage.StorageEngine;
+import com.lealone.test.TestBase;
+import com.lealone.transaction.TransactionEngine;
+import com.lealone.transaction.aote.log.LogSyncService;
 
 public abstract class AoteTestBase extends TestBase implements TestBase.EmbeddedTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/ConcurrentTransactionTest.java b/lealone-test/src/test/java/com/lealone/test/aote/ConcurrentTransactionTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/aote/ConcurrentTransactionTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/ConcurrentTransactionTest.java
index 57d33b8d1..c1ce337db 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/ConcurrentTransactionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/ConcurrentTransactionTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import org.junit.Test;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
+
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
 
 public class ConcurrentTransactionTest extends AoteTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/IsolationLevelTest.java b/lealone-test/src/test/java/com/lealone/test/aote/IsolationLevelTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/aote/IsolationLevelTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/IsolationLevelTest.java
index 82b7a5578..37a9783cd 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/IsolationLevelTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/IsolationLevelTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import org.junit.Test;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
+
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
 
 public class IsolationLevelTest extends AoteTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/TransactionCommitTest.java b/lealone-test/src/test/java/com/lealone/test/aote/TransactionCommitTest.java
similarity index 83%
rename from lealone-test/src/test/java/org/lealone/test/aote/TransactionCommitTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/TransactionCommitTest.java
index cf75bd240..d463be555 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/TransactionCommitTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/TransactionCommitTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import org.junit.Test;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
+
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
 
 public class TransactionCommitTest extends AoteTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/TransactionEngineTest.java b/lealone-test/src/test/java/com/lealone/test/aote/TransactionEngineTest.java
similarity index 88%
rename from lealone-test/src/test/java/org/lealone/test/aote/TransactionEngineTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/TransactionEngineTest.java
index 9febadb3c..a1f612db2 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/TransactionEngineTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/TransactionEngineTest.java
@@ -3,19 +3,20 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import java.util.Map;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.lealone.storage.Storage;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionEngine;
-import org.lealone.transaction.TransactionMap;
-import org.lealone.transaction.aote.AOTransactionEngine;
-import org.lealone.transaction.aote.log.LogSyncService;
+
+import com.lealone.storage.Storage;
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionEngine;
+import com.lealone.transaction.TransactionMap;
+import com.lealone.transaction.aote.AOTransactionEngine;
+import com.lealone.transaction.aote.log.LogSyncService;
 
 public class TransactionEngineTest extends AoteTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/TransactionMapTest.java b/lealone-test/src/test/java/com/lealone/test/aote/TransactionMapTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/aote/TransactionMapTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/TransactionMapTest.java
index 845b819ab..a3ab9ac32 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/TransactionMapTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/TransactionMapTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import org.junit.Test;
-import org.lealone.storage.type.ObjectDataType;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
+
+import com.lealone.storage.type.ObjectDataType;
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
 
 public class TransactionMapTest extends AoteTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/TransactionTest.java b/lealone-test/src/test/java/com/lealone/test/aote/TransactionTest.java
similarity index 89%
rename from lealone-test/src/test/java/org/lealone/test/aote/TransactionTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/TransactionTest.java
index 2f34f042d..b32276ced 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/TransactionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/TransactionTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Test;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
-import org.lealone.transaction.aote.TransactionalValue;
+
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
+import com.lealone.transaction.aote.TransactionalValue;
 
 public class TransactionTest extends AoteTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/aote/TransactionalValueTest.java b/lealone-test/src/test/java/com/lealone/test/aote/TransactionalValueTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/aote/TransactionalValueTest.java
rename to lealone-test/src/test/java/com/lealone/test/aote/TransactionalValueTest.java
index 4e238d079..3ea792882 100644
--- a/lealone-test/src/test/java/org/lealone/test/aote/TransactionalValueTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/aote/TransactionalValueTest.java
@@ -3,20 +3,21 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.aote;
+package com.lealone.test.aote;
 
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Test;
-import org.lealone.db.index.standard.VersionedValue;
-import org.lealone.db.index.standard.VersionedValueType;
-import org.lealone.db.result.SortOrder;
-import org.lealone.db.value.Value;
-import org.lealone.db.value.ValueArray;
-import org.lealone.db.value.ValueInt;
-import org.lealone.transaction.Transaction;
-import org.lealone.transaction.TransactionMap;
-import org.lealone.transaction.aote.TransactionalValue;
+
+import com.lealone.db.index.standard.VersionedValue;
+import com.lealone.db.index.standard.VersionedValueType;
+import com.lealone.db.result.SortOrder;
+import com.lealone.db.value.Value;
+import com.lealone.db.value.ValueArray;
+import com.lealone.db.value.ValueInt;
+import com.lealone.transaction.Transaction;
+import com.lealone.transaction.TransactionMap;
+import com.lealone.transaction.aote.TransactionalValue;
 
 public class TransactionalValueTest extends AoteTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/client/AsyncConcurrentUpdateTest.java b/lealone-test/src/test/java/com/lealone/test/client/AsyncConcurrentUpdateTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/client/AsyncConcurrentUpdateTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/AsyncConcurrentUpdateTest.java
index efb2b63b9..748503f36 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/AsyncConcurrentUpdateTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/AsyncConcurrentUpdateTest.java
@@ -3,16 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcStatement;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.TestBase;
+
+import com.lealone.client.jdbc.JdbcStatement;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.TestBase;
 
 public class AsyncConcurrentUpdateTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/BatchTest.java b/lealone-test/src/test/java/com/lealone/test/client/BatchTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/client/BatchTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/BatchTest.java
index 1a708d1dd..db0d1ecaa 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/BatchTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/BatchTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -11,7 +11,8 @@
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Test;
-import org.lealone.common.exceptions.DbException;
+
+import com.lealone.common.exceptions.DbException;
 
 public class BatchTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/ClientTestBase.java b/lealone-test/src/test/java/com/lealone/test/client/ClientTestBase.java
similarity index 80%
rename from lealone-test/src/test/java/org/lealone/test/client/ClientTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/client/ClientTestBase.java
index fe8f37932..251afc931 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/ClientTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/ClientTestBase.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
-import org.lealone.test.sql.SqlTestBase;
+import com.lealone.test.sql.SqlTestBase;
 
 public abstract class ClientTestBase extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcArrayTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcArrayTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcArrayTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcArrayTest.java
index bf1da9a29..48f5986df 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcArrayTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcArrayTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -11,7 +11,8 @@
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcArray;
+
+import com.lealone.client.jdbc.JdbcArray;
 
 public class JdbcArrayTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcBlobTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcBlobTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcBlobTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcBlobTest.java
index 72c8b1cb6..5940a6d3a 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcBlobTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcBlobTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -11,7 +11,8 @@
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcBlob;
+
+import com.lealone.client.jdbc.JdbcBlob;
 
 public class JdbcBlobTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcCallableStatementTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcCallableStatementTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcCallableStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcCallableStatementTest.java
index 35b5d35e6..e756d26fe 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcCallableStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcCallableStatementTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.CallableStatement;
 import java.sql.Types;
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcClobEmbedTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcClobEmbedTest.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcClobEmbedTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcClobEmbedTest.java
index 4deba198f..7d2934343 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcClobEmbedTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcClobEmbedTest.java
@@ -3,14 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
 
-import org.lealone.db.SysProperties;
-import org.lealone.test.UnitTestBase;
+import com.lealone.db.SysProperties;
+import com.lealone.test.UnitTestBase;
 
 // 跑玩JdbcClobTest后，停掉tcp server再测
 public class JdbcClobEmbedTest extends UnitTestBase {
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcClobTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcClobTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcClobTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcClobTest.java
index 58349efd1..614ca1422 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcClobTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcClobTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.io.File;
 import java.sql.Connection;
@@ -12,7 +12,8 @@
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcClob;
+
+import com.lealone.client.jdbc.JdbcClob;
 
 public class JdbcClobTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcConnectionTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcConnectionTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcConnectionTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcConnectionTest.java
index 6940efae8..b34c90189 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcConnectionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcConnectionTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -11,10 +11,11 @@
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcConnection;
-import org.lealone.client.jdbc.JdbcStatement;
-import org.lealone.db.Constants;
-import org.lealone.db.LealoneDatabase;
+
+import com.lealone.client.jdbc.JdbcConnection;
+import com.lealone.client.jdbc.JdbcStatement;
+import com.lealone.db.Constants;
+import com.lealone.db.LealoneDatabase;
 
 public class JdbcConnectionTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcDatabaseMetaDataTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcDatabaseMetaDataTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcDatabaseMetaDataTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcDatabaseMetaDataTest.java
index c6c32b6e6..e7a90f161 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcDatabaseMetaDataTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcDatabaseMetaDataTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcDriverTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcDriverTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcDriverTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcDriverTest.java
index 960c159f0..884d5bd04 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcDriverTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcDriverTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcDriver;
-import org.lealone.db.LealoneDatabase;
+
+import com.lealone.client.jdbc.JdbcDriver;
+import com.lealone.db.LealoneDatabase;
 
 public class JdbcDriverTest extends ClientTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcPreparedStatementTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcPreparedStatementTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcPreparedStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcPreparedStatementTest.java
index d2aa0e0ad..243f3a542 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcPreparedStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcPreparedStatementTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.ParameterMetaData;
@@ -16,9 +16,10 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcPreparedStatement;
-import org.lealone.client.jdbc.JdbcResultSet;
-import org.lealone.db.SysProperties;
+
+import com.lealone.client.jdbc.JdbcPreparedStatement;
+import com.lealone.client.jdbc.JdbcResultSet;
+import com.lealone.db.SysProperties;
 
 public class JdbcPreparedStatementTest extends ClientTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/client/JdbcStatementTest.java b/lealone-test/src/test/java/com/lealone/test/client/JdbcStatementTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/client/JdbcStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/JdbcStatementTest.java
index 4246db5ab..c88dad397 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/JdbcStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/JdbcStatementTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -14,8 +14,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcResultSet;
-import org.lealone.client.jdbc.JdbcStatement;
+
+import com.lealone.client.jdbc.JdbcResultSet;
+import com.lealone.client.jdbc.JdbcStatement;
 
 public class JdbcStatementTest extends ClientTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/client/LealoneClientTest.java b/lealone-test/src/test/java/com/lealone/test/client/LealoneClientTest.java
similarity index 88%
rename from lealone-test/src/test/java/org/lealone/test/client/LealoneClientTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/LealoneClientTest.java
index a6bc204ae..f0f61426f 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/LealoneClientTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/LealoneClientTest.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.lealone.client.LealoneClient;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.async.Future;
-import org.lealone.test.TestBase;
-import org.lealone.test.TestBase.MainTest;
+import com.lealone.client.LealoneClient;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.async.Future;
+import com.lealone.test.TestBase;
+import com.lealone.test.TestBase.MainTest;
 
 public class LealoneClientTest implements MainTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/client/SharedConnectionTest.java b/lealone-test/src/test/java/com/lealone/test/client/SharedConnectionTest.java
similarity index 77%
rename from lealone-test/src/test/java/org/lealone/test/client/SharedConnectionTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/SharedConnectionTest.java
index ab3e37f27..42008f545 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/SharedConnectionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/SharedConnectionTest.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
-import org.lealone.client.LealoneClient;
-import org.lealone.client.jdbc.JdbcConnection;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.async.Future;
-import org.lealone.test.TestBase;
-import org.lealone.test.TestBase.MainTest;
+import com.lealone.client.LealoneClient;
+import com.lealone.client.jdbc.JdbcConnection;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.async.Future;
+import com.lealone.test.TestBase;
+import com.lealone.test.TestBase.MainTest;
 
 public class SharedConnectionTest implements MainTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/client/TraceTest.java b/lealone-test/src/test/java/com/lealone/test/client/TraceTest.java
similarity index 89%
rename from lealone-test/src/test/java/org/lealone/test/client/TraceTest.java
rename to lealone-test/src/test/java/com/lealone/test/client/TraceTest.java
index 5887e485c..00734cc56 100644
--- a/lealone-test/src/test/java/org/lealone/test/client/TraceTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/client/TraceTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.client;
+package com.lealone.test.client;
 
 import java.sql.ResultSet;
 
 import org.junit.Test;
-import org.lealone.common.trace.TraceSystem;
+
+import com.lealone.common.trace.TraceSystem;
 
 public class TraceTest extends ClientTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/CommentTest.java b/lealone-test/src/test/java/com/lealone/test/db/CommentTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/db/CommentTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/CommentTest.java
index b5b5e69e6..59490e855 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/CommentTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/CommentTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
 import org.junit.Test;
-import org.lealone.db.Comment;
-import org.lealone.db.Constants;
-import org.lealone.db.auth.Role;
-import org.lealone.db.table.Table;
+
+import com.lealone.db.Comment;
+import com.lealone.db.Constants;
+import com.lealone.db.auth.Role;
+import com.lealone.db.table.Table;
 
 public class CommentTest extends DbObjectTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/ConnectionInfoTest.java b/lealone-test/src/test/java/com/lealone/test/db/ConnectionInfoTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/db/ConnectionInfoTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/ConnectionInfoTest.java
index 6d537eeb7..b68f42202 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/ConnectionInfoTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/ConnectionInfoTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
 import java.util.Properties;
 
 import org.junit.Test;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.ConnectionSetting;
+
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.ConnectionSetting;
 
 public class ConnectionInfoTest extends DbTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/DatabaseTest.java b/lealone-test/src/test/java/com/lealone/test/db/DatabaseTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/db/DatabaseTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/DatabaseTest.java
index ca9f722b0..e44127403 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/DatabaseTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/DatabaseTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
 import org.junit.Test;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.SearchRow;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.SearchRow;
 
 public class DatabaseTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/DbObjectTestBase.java b/lealone-test/src/test/java/com/lealone/test/db/DbObjectTestBase.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/db/DbObjectTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/db/DbObjectTestBase.java
index e5f3d1f6e..db94d178c 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/DbObjectTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/DbObjectTestBase.java
@@ -3,23 +3,24 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 
 import org.junit.Before;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.Constants;
-import org.lealone.db.Database;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.auth.Role;
-import org.lealone.db.auth.User;
-import org.lealone.db.result.Result;
-import org.lealone.db.result.SearchRow;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.session.ServerSession;
-import org.lealone.db.table.Table;
+
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.Constants;
+import com.lealone.db.Database;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.auth.Role;
+import com.lealone.db.auth.User;
+import com.lealone.db.result.Result;
+import com.lealone.db.result.SearchRow;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.session.ServerSession;
+import com.lealone.db.table.Table;
 
 public class DbObjectTestBase extends DbTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/DbTestBase.java b/lealone-test/src/test/java/com/lealone/test/db/DbTestBase.java
similarity index 66%
rename from lealone-test/src/test/java/org/lealone/test/db/DbTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/db/DbTestBase.java
index c998299e0..efa8de356 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/DbTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/DbTestBase.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
-import org.lealone.db.PluginManager;
-import org.lealone.db.session.ServerSessionFactory;
-import org.lealone.db.session.SessionFactory;
-import org.lealone.test.UnitTestBase;
+import com.lealone.db.PluginManager;
+import com.lealone.db.session.ServerSessionFactory;
+import com.lealone.db.session.SessionFactory;
+import com.lealone.test.UnitTestBase;
 
 public abstract class DbTestBase extends UnitTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/ServerSessionFactoryTest.java b/lealone-test/src/test/java/com/lealone/test/db/ServerSessionFactoryTest.java
similarity index 80%
rename from lealone-test/src/test/java/org/lealone/test/db/ServerSessionFactoryTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/ServerSessionFactoryTest.java
index af9caf1a6..121c99aa1 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/ServerSessionFactoryTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/ServerSessionFactoryTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
 import org.junit.Test;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.db.ConnectionInfo;
-import org.lealone.db.api.ErrorCode;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.db.ConnectionInfo;
+import com.lealone.db.api.ErrorCode;
 
 public class ServerSessionFactoryTest extends DbTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/SessionTest.java b/lealone-test/src/test/java/com/lealone/test/db/SessionTest.java
similarity index 84%
rename from lealone-test/src/test/java/org/lealone/test/db/SessionTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/SessionTest.java
index 5c084bb09..5239a7229 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/SessionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/SessionTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db;
+package com.lealone.test.db;
 
 import org.junit.Test;
-import org.lealone.db.session.ServerSession;
-import org.lealone.sql.PreparedSQLStatement;
+
+import com.lealone.db.session.ServerSession;
+import com.lealone.sql.PreparedSQLStatement;
 
 public class SessionTest extends DbTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/auth/RightTest.java b/lealone-test/src/test/java/com/lealone/test/db/auth/RightTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/db/auth/RightTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/auth/RightTest.java
index 62e15e245..2e20d33b1 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/auth/RightTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/auth/RightTest.java
@@ -3,17 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.auth;
+package com.lealone.test.db.auth;
 
 import org.junit.Test;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Right;
-import org.lealone.db.auth.Role;
-import org.lealone.db.auth.User;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.table.Table;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Right;
+import com.lealone.db.auth.Role;
+import com.lealone.db.auth.User;
+import com.lealone.db.schema.Schema;
+import com.lealone.db.table.Table;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class RightTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/auth/RoleTest.java b/lealone-test/src/test/java/com/lealone/test/db/auth/RoleTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/db/auth/RoleTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/auth/RoleTest.java
index 648c0b617..e7d0b6439 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/auth/RoleTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/auth/RoleTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.auth;
+package com.lealone.test.db.auth;
 
 import org.junit.Test;
-import org.lealone.db.Constants;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.Role;
-import org.lealone.db.result.SearchRow;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.Constants;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.Role;
+import com.lealone.db.result.SearchRow;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class RoleTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/auth/UserTest.java b/lealone-test/src/test/java/com/lealone/test/db/auth/UserTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/db/auth/UserTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/auth/UserTest.java
index 4e0e69c3b..de38ea1ca 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/auth/UserTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/auth/UserTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.auth;
+package com.lealone.test.db.auth;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.auth.User;
-import org.lealone.db.result.SearchRow;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.auth.User;
+import com.lealone.db.result.SearchRow;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class UserTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintCheckTest.java b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintCheckTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintCheckTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintCheckTest.java
index 121eb92c6..03505e189 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintCheckTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintCheckTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.constraint;
+package com.lealone.test.db.constraint;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
+
+import com.lealone.db.api.ErrorCode;
 
 public class ConstraintCheckTest extends ConstraintTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintReferentialTest.java b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintReferentialTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintReferentialTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintReferentialTest.java
index 728aeb1ae..5020e4b22 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintReferentialTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintReferentialTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.constraint;
+package com.lealone.test.db.constraint;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
+
+import com.lealone.db.api.ErrorCode;
 
 public class ConstraintReferentialTest extends ConstraintTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintTestBase.java b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintTestBase.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintTestBase.java
index f79561187..33d73c9db 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintTestBase.java
@@ -3,12 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.constraint;
+package com.lealone.test.db.constraint;
 
 import java.util.ArrayList;
 
-import org.lealone.db.constraint.Constraint;
-import org.lealone.test.db.DbObjectTestBase;
+import com.lealone.db.constraint.Constraint;
+import com.lealone.test.db.DbObjectTestBase;
 
 public abstract class ConstraintTestBase extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintUniqueTest.java b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintUniqueTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintUniqueTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintUniqueTest.java
index 1265ec102..4e2299d9c 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/constraint/ConstraintUniqueTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/constraint/ConstraintUniqueTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.constraint;
+package com.lealone.test.db.constraint;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
+
+import com.lealone.db.api.ErrorCode;
 
 public class ConstraintUniqueTest extends ConstraintTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/index/IndexRebuildTest.java b/lealone-test/src/test/java/com/lealone/test/db/index/IndexRebuildTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/db/index/IndexRebuildTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/index/IndexRebuildTest.java
index a714bf716..7fb58e855 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/index/IndexRebuildTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/index/IndexRebuildTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.index;
+package com.lealone.test.db.index;
 
 import org.junit.Test;
-import org.lealone.db.Constants;
-import org.lealone.db.index.Index;
+
+import com.lealone.db.Constants;
+import com.lealone.db.index.Index;
 
 public class IndexRebuildTest extends IndexTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/index/IndexTest.java b/lealone-test/src/test/java/com/lealone/test/db/index/IndexTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/db/index/IndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/index/IndexTest.java
index 3dc9ce7b7..4a07da2f5 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/index/IndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/index/IndexTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.index;
+package com.lealone.test.db.index;
 
 import org.junit.Test;
-import org.lealone.db.Constants;
-import org.lealone.db.index.Index;
-import org.lealone.db.table.Table;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.Constants;
+import com.lealone.db.index.Index;
+import com.lealone.db.table.Table;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class IndexTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/index/IndexTestBase.java b/lealone-test/src/test/java/com/lealone/test/db/index/IndexTestBase.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/db/index/IndexTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/db/index/IndexTestBase.java
index 63d673dee..d57521dce 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/index/IndexTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/index/IndexTestBase.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.index;
+package com.lealone.test.db.index;
 
 import java.util.ArrayList;
 
-import org.lealone.db.index.Index;
-import org.lealone.db.table.Table;
-import org.lealone.test.db.DbObjectTestBase;
+import com.lealone.db.index.Index;
+import com.lealone.db.table.Table;
+import com.lealone.test.db.DbObjectTestBase;
 
 public abstract class IndexTestBase extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/index/NonUniqueHashIndexTest.java b/lealone-test/src/test/java/com/lealone/test/db/index/NonUniqueHashIndexTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/db/index/NonUniqueHashIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/index/NonUniqueHashIndexTest.java
index 67336f0e4..c035f5700 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/index/NonUniqueHashIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/index/NonUniqueHashIndexTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.index;
+package com.lealone.test.db.index;
 
 import org.junit.Test;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/index/UniqueHashIndexTest.java b/lealone-test/src/test/java/com/lealone/test/db/index/UniqueHashIndexTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/db/index/UniqueHashIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/index/UniqueHashIndexTest.java
index bd0306064..0d1443960 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/index/UniqueHashIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/index/UniqueHashIndexTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.index;
+package com.lealone.test.db.index;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
+
+import com.lealone.db.api.ErrorCode;
 
 public class UniqueHashIndexTest extends IndexTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/ConstantTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/ConstantTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/ConstantTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/ConstantTest.java
index 0f1f367f4..65a2238b6 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/ConstantTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/ConstantTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import org.junit.Test;
-import org.lealone.db.session.ServerSession;
-import org.lealone.test.db.DbObjectTestBase;
-import org.lealone.transaction.Transaction;
+
+import com.lealone.db.session.ServerSession;
+import com.lealone.test.db.DbObjectTestBase;
+import com.lealone.transaction.Transaction;
 
 public class ConstantTest extends DbObjectTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/FunctionAliasTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/FunctionAliasTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/FunctionAliasTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/FunctionAliasTest.java
index c5310ea0a..6844a3f00 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/FunctionAliasTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/FunctionAliasTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import org.junit.Test;
-import org.lealone.db.result.Result;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.result.Result;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class FunctionAliasTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/SchemaTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/SchemaTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/SchemaTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/SchemaTest.java
index f242a4733..2b69f894c 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/SchemaTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/SchemaTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.schema.Schema;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.schema.Schema;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class SchemaTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/SequenceTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/SequenceTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/SequenceTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/SequenceTest.java
index 74136c568..11fc25cbb 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/SequenceTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/SequenceTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.Result;
-import org.lealone.db.schema.Sequence;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.Result;
+import com.lealone.db.schema.Sequence;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class SequenceTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/TriggerObjectTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/TriggerObjectTest.java
similarity index 85%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/TriggerObjectTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/TriggerObjectTest.java
index bb20e09b3..47ea0dd91 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/TriggerObjectTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/TriggerObjectTest.java
@@ -3,16 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.api.Trigger;
-import org.lealone.db.result.Result;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.api.Trigger;
+import com.lealone.db.result.Result;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class TriggerObjectTest extends DbObjectTestBase {
 
@@ -31,12 +32,12 @@ public void fire(Connection conn, Object[] oldRow, Object[] newRow) throws SQLEx
 
         @Override
         public void close() throws SQLException {
-            System.out.println("org.lealone.test.db.schema.TriggerObjectTest.MyInsertTrigger.close()");
+            System.out.println("com.lealone.test.db.schema.TriggerObjectTest.MyInsertTrigger.close()");
         }
 
         @Override
         public void remove() throws SQLException {
-            System.out.println("org.lealone.test.db.schema.TriggerObjectTest.MyInsertTrigger.remove()");
+            System.out.println("com.lealone.test.db.schema.TriggerObjectTest.MyInsertTrigger.remove()");
         }
     }
 
@@ -54,7 +55,7 @@ void create() {
 
         executeUpdate("CREATE FORCE TRIGGER IF NOT EXISTS MyTrigger1"
                 + " BEFORE INSERT,UPDATE,DELETE,SELECT,ROLLBACK ON CreateTriggerTest"
-                + " QUEUE 10 NOWAIT CALL \"org.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
+                + " QUEUE 10 NOWAIT CALL \"com.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
         session.commit();
         session.setAutoCommit(true);
 
@@ -64,7 +65,7 @@ void create() {
             // QUEUE不能是负数
             executeUpdate("CREATE TRIGGER IF NOT EXISTS MyTrigger2"//
                     + " AFTER INSERT ON CreateTriggerTest"
-                    + " QUEUE -1 CALL \"org.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
+                    + " QUEUE -1 CALL \"com.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
             fail();
         } catch (Exception e) {
             assertException(e, ErrorCode.INVALID_VALUE_2);
@@ -73,7 +74,7 @@ void create() {
         try {
             executeUpdate("CREATE TRIGGER IF NOT EXISTS MyTrigger2"
                     + " AFTER INSERT,UPDATE,DELETE,SELECT,ROLLBACK ON CreateTriggerTest FOR EACH ROW"
-                    + " QUEUE 10 NOWAIT CALL \"org.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
+                    + " QUEUE 10 NOWAIT CALL \"com.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
             fail();
         } catch (Exception e) {
             assertException(e, ErrorCode.TRIGGER_SELECT_AND_ROW_BASED_NOT_SUPPORTED);
@@ -82,7 +83,7 @@ void create() {
         // INSTEAD OF也是BEFORE类型
         executeUpdate("CREATE TRIGGER IF NOT EXISTS MyTrigger3"
                 + " INSTEAD OF INSERT,UPDATE,DELETE,ROLLBACK ON CreateTriggerTest FOR EACH ROW"
-                + " QUEUE 10 NOWAIT CALL \"org.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
+                + " QUEUE 10 NOWAIT CALL \"com.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
 
         // 这种语法可查入多条记录
         // null null
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/UserAggregateTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/UserAggregateTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/UserAggregateTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/UserAggregateTest.java
index 71ec439a5..169324e34 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/UserAggregateTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/UserAggregateTest.java
@@ -3,16 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import java.sql.Connection;
 import java.util.ArrayList;
 
 import org.junit.Test;
-import org.lealone.db.api.Aggregate;
-import org.lealone.db.schema.UserAggregate;
-import org.lealone.db.value.Value;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.Aggregate;
+import com.lealone.db.schema.UserAggregate;
+import com.lealone.db.value.Value;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class UserAggregateTest extends DbObjectTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/schema/UserDataTypeTest.java b/lealone-test/src/test/java/com/lealone/test/db/schema/UserDataTypeTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/db/schema/UserDataTypeTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/schema/UserDataTypeTest.java
index c0cb793ac..9701981e9 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/schema/UserDataTypeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/schema/UserDataTypeTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.schema;
+package com.lealone.test.db.schema;
 
 import org.junit.Test;
-import org.lealone.db.schema.UserDataType;
-import org.lealone.db.table.Column;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.schema.UserDataType;
+import com.lealone.db.table.Column;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class UserDataTypeTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/table/FunctionTableTest.java b/lealone-test/src/test/java/com/lealone/test/db/table/FunctionTableTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/db/table/FunctionTableTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/table/FunctionTableTest.java
index 98f0ac4ad..b78cd973f 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/table/FunctionTableTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/table/FunctionTableTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.table;
+package com.lealone.test.db.table;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.result.Result;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.result.Result;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class FunctionTableTest extends DbObjectTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/table/MetaTableTest.java b/lealone-test/src/test/java/com/lealone/test/db/table/MetaTableTest.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/db/table/MetaTableTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/table/MetaTableTest.java
index 9795f2a1b..a6e49f0fe 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/table/MetaTableTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/table/MetaTableTest.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.table;
+package com.lealone.test.db.table;
 
 import java.util.ArrayList;
 
 import org.junit.Test;
-import org.lealone.db.schema.Schema;
-import org.lealone.db.table.InfoMetaTable;
-import org.lealone.db.table.Table;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.schema.Schema;
+import com.lealone.db.table.InfoMetaTable;
+import com.lealone.db.table.Table;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class MetaTableTest extends DbObjectTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/table/RangeTableTest.java b/lealone-test/src/test/java/com/lealone/test/db/table/RangeTableTest.java
similarity index 83%
rename from lealone-test/src/test/java/org/lealone/test/db/table/RangeTableTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/table/RangeTableTest.java
index 74b82bb31..3eec79d58 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/table/RangeTableTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/table/RangeTableTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.table;
+package com.lealone.test.db.table;
 
 import org.junit.Test;
-import org.lealone.db.result.Result;
-import org.lealone.db.table.RangeTable;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.result.Result;
+import com.lealone.db.table.RangeTable;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class RangeTableTest extends DbObjectTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/db/table/TableTest.java b/lealone-test/src/test/java/com/lealone/test/db/table/TableTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/db/table/TableTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/table/TableTest.java
index ce4c044fa..6c6648eb1 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/table/TableTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/table/TableTest.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.table;
+package com.lealone.test.db.table;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.table.Column;
-import org.lealone.db.table.Table;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.table.Column;
+import com.lealone.db.table.Table;
+import com.lealone.test.db.DbObjectTestBase;
 
 public class TableTest extends DbObjectTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/db/table/ViewTest.java b/lealone-test/src/test/java/com/lealone/test/db/table/ViewTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/db/table/ViewTest.java
rename to lealone-test/src/test/java/com/lealone/test/db/table/ViewTest.java
index d6f073f17..e1c15644a 100644
--- a/lealone-test/src/test/java/org/lealone/test/db/table/ViewTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/db/table/ViewTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.db.table;
+package com.lealone.test.db.table;
 
 import org.junit.Test;
-import org.lealone.test.db.DbObjectTestBase;
+
+import com.lealone.test.db.DbObjectTestBase;
 
 public class ViewTest extends DbObjectTestBase {
     @Test
@@ -123,7 +124,7 @@ public void run0() throws Exception {
         // + "AS SELECT id,name FROM ViewTest";
 
         // 目前不支持参数:
-        // org.lealone.jdbc.JdbcSQLException: Feature not supported: "parameters in views"; SQL statement:
+        // com.lealone.jdbc.JdbcSQLException: Feature not supported: "parameters in views"; SQL statement:
         // sql =
         // "CREATE OR REPLACE FORCE VIEW IF NOT EXISTS my_view (f1,f2) AS SELECT id,name FROM ViewTest where id=?";
         // ps = conn.prepareStatement(sql);
@@ -145,7 +146,7 @@ public void run0() throws Exception {
 
         // sql = "select * from ViewTest";
 
-        // 测试org.lealone.command.Parser.parserWith()
+        // 测试com.lealone.command.Parser.parserWith()
         // executeUpdate("CREATE LOCAL TEMPORARY TABLE IF NOT EXISTS my_tmp_table(f1 int)");
         // executeUpdate("DROP VIEW IF EXISTS my_tmp_table");
         // executeUpdate("CREATE OR REPLACE FORCE VIEW my_tmp_table AS SELECT f2 FROM my_view");
diff --git a/lealone-test/src/test/java/org/lealone/test/fs/FileEncryptTest.java b/lealone-test/src/test/java/com/lealone/test/fs/FileEncryptTest.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/fs/FileEncryptTest.java
rename to lealone-test/src/test/java/com/lealone/test/fs/FileEncryptTest.java
index c0de44c01..a26650124 100644
--- a/lealone-test/src/test/java/org/lealone/test/fs/FileEncryptTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/fs/FileEncryptTest.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.fs;
+package com.lealone.test.fs;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
 import org.junit.Test;
-import org.lealone.storage.fs.FilePath;
-import org.lealone.storage.fs.FileUtils;
-import org.lealone.storage.fs.impl.encrypt.FilePathEncrypt;
+
+import com.lealone.storage.fs.FilePath;
+import com.lealone.storage.fs.FileUtils;
+import com.lealone.storage.fs.impl.encrypt.FilePathEncrypt;
 
 public class FileEncryptTest extends FsTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/fs/FilePathTest.java b/lealone-test/src/test/java/com/lealone/test/fs/FilePathTest.java
similarity index 86%
rename from lealone-test/src/test/java/org/lealone/test/fs/FilePathTest.java
rename to lealone-test/src/test/java/com/lealone/test/fs/FilePathTest.java
index b5efaea94..3286c191f 100644
--- a/lealone-test/src/test/java/org/lealone/test/fs/FilePathTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/fs/FilePathTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.fs;
+package com.lealone.test.fs;
 
 import org.junit.Test;
-import org.lealone.storage.fs.FilePath;
+
+import com.lealone.storage.fs.FilePath;
 
 public class FilePathTest extends FsTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/fs/FileStorageTest.java b/lealone-test/src/test/java/com/lealone/test/fs/FileStorageTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/fs/FileStorageTest.java
rename to lealone-test/src/test/java/com/lealone/test/fs/FileStorageTest.java
index e7de8f83e..21cadd007 100644
--- a/lealone-test/src/test/java/org/lealone/test/fs/FileStorageTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/fs/FileStorageTest.java
@@ -3,17 +3,18 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.fs;
+package com.lealone.test.fs;
 
 import java.io.File;
 import java.nio.ByteBuffer;
 
 import org.junit.Test;
-import org.lealone.common.security.SHA256;
-import org.lealone.storage.fs.FileStorage;
-import org.lealone.storage.fs.FileStorageInputStream;
-import org.lealone.storage.fs.FileStorageOutputStream;
-import org.lealone.test.TestBase;
+
+import com.lealone.common.security.SHA256;
+import com.lealone.storage.fs.FileStorage;
+import com.lealone.storage.fs.FileStorageInputStream;
+import com.lealone.storage.fs.FileStorageOutputStream;
+import com.lealone.test.TestBase;
 
 public class FileStorageTest extends FsTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/fs/FsTestBase.java b/lealone-test/src/test/java/com/lealone/test/fs/FsTestBase.java
similarity index 76%
rename from lealone-test/src/test/java/org/lealone/test/fs/FsTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/fs/FsTestBase.java
index 43151a02f..8762c2278 100644
--- a/lealone-test/src/test/java/org/lealone/test/fs/FsTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/fs/FsTestBase.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.fs;
+package com.lealone.test.fs;
 
-import org.lealone.test.TestBase;
+import com.lealone.test.TestBase;
 
 public class FsTestBase extends TestBase implements TestBase.EmbeddedTest {
 }
diff --git a/lealone-test/src/test/java/org/lealone/test/main/LealoneTest.java b/lealone-test/src/test/java/com/lealone/test/main/LealoneTest.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/main/LealoneTest.java
rename to lealone-test/src/test/java/com/lealone/test/main/LealoneTest.java
index 178d4a76d..87d141284 100644
--- a/lealone-test/src/test/java/org/lealone/test/main/LealoneTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/main/LealoneTest.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.main;
+package com.lealone.test.main;
 
-import org.lealone.main.Lealone;
+import com.lealone.main.Lealone;
 
 public class LealoneTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/main/ShellTest.java b/lealone-test/src/test/java/com/lealone/test/main/ShellTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/main/ShellTest.java
rename to lealone-test/src/test/java/com/lealone/test/main/ShellTest.java
index f1d26f658..73a7e27ce 100644
--- a/lealone-test/src/test/java/org/lealone/test/main/ShellTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/main/ShellTest.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.main;
+package com.lealone.test.main;
 
-import org.lealone.main.Shell;
+import com.lealone.main.Shell;
 
 public class ShellTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/CRUDExample.java b/lealone-test/src/test/java/com/lealone/test/misc/CRUDExample.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/misc/CRUDExample.java
rename to lealone-test/src/test/java/com/lealone/test/misc/CRUDExample.java
index cd969c7d7..246dc3bb7 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/CRUDExample.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/CRUDExample.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
 import org.junit.Assert;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.TestBase;
+
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.TestBase;
 
 public class CRUDExample {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/DeleteTestData.java b/lealone-test/src/test/java/com/lealone/test/misc/DeleteTestData.java
similarity index 83%
rename from lealone-test/src/test/java/org/lealone/test/misc/DeleteTestData.java
rename to lealone-test/src/test/java/com/lealone/test/misc/DeleteTestData.java
index 5d7034cc3..dda321456 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/DeleteTestData.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/DeleteTestData.java
@@ -3,13 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.lealone.storage.fs.FileUtils;
-import org.lealone.test.TestBase;
+import com.lealone.storage.fs.FileUtils;
+import com.lealone.test.TestBase;
 
 public class DeleteTestData {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/EmbeddedExample.java b/lealone-test/src/test/java/com/lealone/test/misc/EmbeddedExample.java
similarity index 85%
rename from lealone-test/src/test/java/org/lealone/test/misc/EmbeddedExample.java
rename to lealone-test/src/test/java/com/lealone/test/misc/EmbeddedExample.java
index ada0f994c..caabbac3b 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/EmbeddedExample.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/EmbeddedExample.java
@@ -3,15 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.db.DbSetting;
-import org.lealone.db.SysProperties;
-import org.lealone.test.TestBase;
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.db.DbSetting;
+import com.lealone.db.SysProperties;
+import com.lealone.test.TestBase;
 
 public class EmbeddedExample {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/ExclusiveModeTest.java b/lealone-test/src/test/java/com/lealone/test/misc/ExclusiveModeTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/misc/ExclusiveModeTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/ExclusiveModeTest.java
index ff616d25a..6c98c76d9 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/ExclusiveModeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/ExclusiveModeTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ExclusiveModeTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/JavaObjectSizeTest.java b/lealone-test/src/test/java/com/lealone/test/misc/JavaObjectSizeTest.java
similarity index 66%
rename from lealone-test/src/test/java/org/lealone/test/misc/JavaObjectSizeTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/JavaObjectSizeTest.java
index 9737d9add..4d602b00a 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/JavaObjectSizeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/JavaObjectSizeTest.java
@@ -3,23 +3,23 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import java.math.BigDecimal;
 
-import org.lealone.db.value.ValueBoolean;
-import org.lealone.db.value.ValueByte;
-import org.lealone.db.value.ValueDate;
-import org.lealone.db.value.ValueDecimal;
-import org.lealone.db.value.ValueDouble;
-import org.lealone.db.value.ValueFloat;
-import org.lealone.db.value.ValueInt;
-import org.lealone.db.value.ValueLong;
-import org.lealone.db.value.ValueNull;
-import org.lealone.db.value.ValueShort;
-import org.lealone.db.value.ValueString;
-import org.lealone.db.value.ValueTimestamp;
-import org.lealone.db.value.ValueUuid;
+import com.lealone.db.value.ValueBoolean;
+import com.lealone.db.value.ValueByte;
+import com.lealone.db.value.ValueDate;
+import com.lealone.db.value.ValueDecimal;
+import com.lealone.db.value.ValueDouble;
+import com.lealone.db.value.ValueFloat;
+import com.lealone.db.value.ValueInt;
+import com.lealone.db.value.ValueLong;
+import com.lealone.db.value.ValueNull;
+import com.lealone.db.value.ValueShort;
+import com.lealone.db.value.ValueString;
+import com.lealone.db.value.ValueTimestamp;
+import com.lealone.db.value.ValueUuid;
 
 public class JavaObjectSizeTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/MemDiskTest.java b/lealone-test/src/test/java/com/lealone/test/misc/MemDiskTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/misc/MemDiskTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/MemDiskTest.java
index e2c82952d..9d5622fdf 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/MemDiskTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/MemDiskTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import java.io.File;
 import java.lang.management.ManagementFactory;
@@ -29,7 +29,7 @@ public static void getDiskInfo() {
             System.out.println();
         }
         System.out.println();
-        long size = org.lealone.storage.fs.FileUtils.folderSize(new File("./target"));
+        long size = com.lealone.storage.fs.FileUtils.folderSize(new File("./target"));
         System.out.println("Target Dir Size: " + toM(size));
     }
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/QueryStatisticsTest.java b/lealone-test/src/test/java/com/lealone/test/misc/QueryStatisticsTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/misc/QueryStatisticsTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/QueryStatisticsTest.java
index a44ab2b88..15ecad5fe 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/QueryStatisticsTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/QueryStatisticsTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import org.junit.Test;
-import org.lealone.common.trace.TraceSystem;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.common.trace.TraceSystem;
+import com.lealone.test.sql.SqlTestBase;
 
 public class QueryStatisticsTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/SchedulerYieldBugTest.java b/lealone-test/src/test/java/com/lealone/test/misc/SchedulerYieldBugTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/misc/SchedulerYieldBugTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/SchedulerYieldBugTest.java
index 04aa9a731..04a6a08a8 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/SchedulerYieldBugTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/SchedulerYieldBugTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
 import org.junit.Test;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.sql.SqlTestBase;
 
 // 执行insert语句时会从TableAlterHistory获取表结构的版本号，
 // TableAlterHistory通过执行Prepared类型的select语句查询版本号，
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/SourceCompilerTest.java b/lealone-test/src/test/java/com/lealone/test/misc/SourceCompilerTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/misc/SourceCompilerTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/SourceCompilerTest.java
index 6a835a2f3..28df932f0 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/SourceCompilerTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/SourceCompilerTest.java
@@ -3,9 +3,9 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
-import org.lealone.db.util.SourceCompiler;
+import com.lealone.db.util.SourceCompiler;
 
 public class SourceCompilerTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/misc/WrongPasswordTest.java b/lealone-test/src/test/java/com/lealone/test/misc/WrongPasswordTest.java
similarity index 88%
rename from lealone-test/src/test/java/org/lealone/test/misc/WrongPasswordTest.java
rename to lealone-test/src/test/java/com/lealone/test/misc/WrongPasswordTest.java
index 3f7821cb9..a566cb6e7 100644
--- a/lealone-test/src/test/java/org/lealone/test/misc/WrongPasswordTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/misc/WrongPasswordTest.java
@@ -3,10 +3,10 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.misc;
+package com.lealone.test.misc;
 
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.TestBase;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.TestBase;
 
 public class WrongPasswordTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/PluginManagerTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/PluginManagerTest.java
similarity index 84%
rename from lealone-test/src/test/java/org/lealone/test/plugins/PluginManagerTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/PluginManagerTest.java
index aeb2cd8f9..1690f6bb5 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/PluginManagerTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/PluginManagerTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins;
+package com.lealone.test.plugins;
 
 import org.junit.Test;
-import org.lealone.db.PluginManager;
-import org.lealone.storage.StorageEngine;
-import org.lealone.storage.aose.AOStorageEngine;
-import org.lealone.test.TestBase;
+
+import com.lealone.db.PluginManager;
+import com.lealone.storage.StorageEngine;
+import com.lealone.storage.aose.AOStorageEngine;
+import com.lealone.test.TestBase;
 
 public class PluginManagerTest extends TestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/PluginTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/PluginTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/plugins/PluginTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/PluginTest.java
index beab8756a..6e8d9e4f8 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/PluginTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/PluginTest.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins;
+package com.lealone.test.plugins;
 
 import java.util.Map;
 
 import org.junit.Test;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.Plugin;
-import org.lealone.db.PluginBase;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.Plugin;
+import com.lealone.db.PluginBase;
+import com.lealone.test.sql.SqlTestBase;
 
 public class PluginTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAdminCommandTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAdminCommandTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAdminCommandTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAdminCommandTest.java
index ee43e0085..1e6f7522d 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAdminCommandTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAdminCommandTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAggregateTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAggregateTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAggregateTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAggregateTest.java
index 2ac7c3e0d..a66b521cd 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAggregateTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAggregateTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import static com.mongodb.client.model.mql.MqlValues.current;
 import static com.mongodb.client.model.mql.MqlValues.of;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java
index f14d92c96..1031714e2 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonAuthenticationCommandTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonFilterTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonFilterTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonFilterTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonFilterTest.java
index 1108d8a8f..a307d809a 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonFilterTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonFilterTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import java.util.ArrayList;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonIndexTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonIndexTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonIndexTest.java
index 03f7571f9..02a8361b4 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonIndexTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import java.sql.Date;
 import java.util.ArrayList;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonTypeTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonTypeTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonTypeTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonTypeTest.java
index ff3f96a85..448dc9dca 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonTypeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonTypeTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import org.bson.Document;
 import org.junit.Before;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java
index e5eae05dc..24c9d5177 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/BsonUpdateOperatorTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import java.sql.Date;
 import java.util.ArrayList;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoArrayTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoArrayTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoArrayTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoArrayTest.java
index 6f196c000..d656176f8 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoArrayTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoArrayTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import java.util.List;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoCrudTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoCrudTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoCrudTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoCrudTest.java
index 91277dd6f..747fcbe99 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoCrudTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoCrudTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import java.util.ArrayList;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoIdTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoIdTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoIdTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoIdTest.java
index 578bd71bc..753868d83 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoIdTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoIdTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import org.bson.Document;
 import org.junit.Test;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoTestBase.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoTestBase.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoTestBase.java
index 26f468670..81297698c 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MongoTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MongoTestBase.java
@@ -3,16 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.lealone.plugins.mongo.server.MongoServer;
-import org.lealone.test.UnitTestBase;
 
+import com.lealone.plugins.mongo.server.MongoServer;
+import com.lealone.test.UnitTestBase;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MqlTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MqlTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mongo/MqlTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mongo/MqlTest.java
index 3e5b965f6..4da4fb29c 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mongo/MqlTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mongo/MqlTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mongo;
+package com.lealone.test.plugins.mongo;
 
 import static com.mongodb.client.model.mql.MqlValues.current;
 import static com.mongodb.client.model.mql.MqlValues.of;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/CatalogStatementTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/CatalogStatementTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/CatalogStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/CatalogStatementTest.java
index 4e6d76187..72cd6f525 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/CatalogStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/CatalogStatementTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java
index 3ffcc4aa5..80b401837 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/JdbcDatabaseMetaDataTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLJdbcTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLJdbcTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLJdbcTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLJdbcTest.java
index dc3ce3230..41c875cb2 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLJdbcTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLJdbcTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLShowStatementTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLShowStatementTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLShowStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLShowStatementTest.java
index 78fae9df2..d2fd53cfb 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLShowStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLShowStatementTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import java.sql.ResultSet;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLSyntaxTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLSyntaxTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLSyntaxTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLSyntaxTest.java
index b5236483d..af84f055a 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLSyntaxTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLSyntaxTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import org.junit.Test;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLTestBase.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLTestBase.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLTestBase.java
index 357fbc369..a31ead476 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/MySQLTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/MySQLTestBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -11,8 +11,9 @@
 import java.util.Properties;
 
 import org.junit.Before;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.test.sql.SqlTestBase;
 
 public class MySQLTestBase extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/PasswordTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/PasswordTest.java
similarity index 75%
rename from lealone-test/src/test/java/org/lealone/test/plugins/mysql/PasswordTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/mysql/PasswordTest.java
index f2f9efb79..6fc555d88 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/mysql/PasswordTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/mysql/PasswordTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.mysql;
+package com.lealone.test.plugins.mysql;
 
 import org.junit.Test;
-import org.lealone.common.util.Utils;
-import org.lealone.plugins.mysql.server.util.RandomUtil;
-import org.lealone.plugins.mysql.server.util.SecurityUtil;
+
+import com.lealone.common.util.Utils;
+import com.lealone.plugins.mysql.server.util.RandomUtil;
+import com.lealone.plugins.mysql.server.util.SecurityUtil;
 
 public class PasswordTest extends MySQLTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgJdbcTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgJdbcTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgJdbcTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgJdbcTest.java
index 9197222f6..a7ab84956 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgJdbcTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgJdbcTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.postgresql;
+package com.lealone.test.plugins.postgresql;
 
 import java.sql.ParameterMetaData;
 import java.sql.PreparedStatement;
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgSyntaxTest.java b/lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgSyntaxTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgSyntaxTest.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgSyntaxTest.java
index a238ce741..b51973bc3 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgSyntaxTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgSyntaxTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.postgresql;
+package com.lealone.test.plugins.postgresql;
 
 import org.junit.Test;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgTestBase.java b/lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgTestBase.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgTestBase.java
index b81b8e61d..7eb0506a1 100644
--- a/lealone-test/src/test/java/org/lealone/test/plugins/postgresql/PgTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/plugins/postgresql/PgTestBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.plugins.postgresql;
+package com.lealone.test.plugins.postgresql;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -11,8 +11,9 @@
 import java.util.Properties;
 
 import org.junit.Before;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.test.sql.SqlTestBase;
 
 public class PgTestBase extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/SqlTestBase.java b/lealone-test/src/test/java/com/lealone/test/sql/SqlTestBase.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/SqlTestBase.java
rename to lealone-test/src/test/java/com/lealone/test/sql/SqlTestBase.java
index f02a243fb..e94d2cda0 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/SqlTestBase.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/SqlTestBase.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql;
+package com.lealone.test.sql;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -12,12 +12,13 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.lealone.common.exceptions.DbException;
-import org.lealone.common.util.JdbcUtils;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.RunMode;
-import org.lealone.test.LealoneStart;
-import org.lealone.test.TestBase;
+
+import com.lealone.common.exceptions.DbException;
+import com.lealone.common.util.JdbcUtils;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.RunMode;
+import com.lealone.test.LealoneStart;
+import com.lealone.test.TestBase;
 
 public class SqlTestBase extends TestBase implements TestBase.SqlExecutor, TestBase.ClientServerTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/admin/ShutdownDatabaseTest.java b/lealone-test/src/test/java/com/lealone/test/sql/admin/ShutdownDatabaseTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/sql/admin/ShutdownDatabaseTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/admin/ShutdownDatabaseTest.java
index c7799ad27..9ca950182 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/admin/ShutdownDatabaseTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/admin/ShutdownDatabaseTest.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.admin;
+package com.lealone.test.sql.admin;
 
 import java.sql.Connection;
 
 import org.junit.Test;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.LealoneDatabase;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class ShutdownDatabaseTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/admin/ShutdownServerTest.java b/lealone-test/src/test/java/com/lealone/test/sql/admin/ShutdownServerTest.java
similarity index 81%
rename from lealone-test/src/test/java/org/lealone/test/sql/admin/ShutdownServerTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/admin/ShutdownServerTest.java
index 02483927c..e59167c19 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/admin/ShutdownServerTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/admin/ShutdownServerTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.admin;
+package com.lealone.test.sql.admin;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.TestBase.MainTest;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.TestBase.MainTest;
+import com.lealone.test.sql.SqlTestBase;
 
 public class ShutdownServerTest extends SqlTestBase implements MainTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/ddl/AlterUserTest.java b/lealone-test/src/test/java/com/lealone/test/sql/ddl/AlterUserTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/sql/ddl/AlterUserTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/ddl/AlterUserTest.java
index 81311c34e..c52fe1dbc 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/ddl/AlterUserTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/ddl/AlterUserTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.ddl;
+package com.lealone.test.sql.ddl;
 
 import java.sql.Connection;
 
 import org.junit.Test;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.sql.SqlTestBase;
 
 //之前存在bug: 内部实现用用户名和密码组成hash，重命名用户后不能通过原来的密码登录
 //这个测试用例就是用来测试这个bug
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/ddl/DatabaseStatementTest.java b/lealone-test/src/test/java/com/lealone/test/sql/ddl/DatabaseStatementTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/ddl/DatabaseStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/ddl/DatabaseStatementTest.java
index 536984713..e4ea9118e 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/ddl/DatabaseStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/ddl/DatabaseStatementTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.ddl;
+package com.lealone.test.sql.ddl;
 
 import org.junit.Test;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.sql.SqlTestBase;
 
 public class DatabaseStatementTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/ddl/TruncateTableTest.java b/lealone-test/src/test/java/com/lealone/test/sql/ddl/TruncateTableTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/sql/ddl/TruncateTableTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/ddl/TruncateTableTest.java
index 5252c799f..91546d588 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/ddl/TruncateTableTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/ddl/TruncateTableTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.ddl;
+package com.lealone.test.sql.ddl;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class TruncateTableTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/BackupTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/BackupTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/BackupTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/BackupTest.java
index f0ed69437..9861fccfd 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/BackupTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/BackupTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class BackupTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/CallTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/CallTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/CallTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/CallTest.java
index f4b3078f6..a58620df6 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/CallTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/CallTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class CallTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/DeleteTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/DeleteTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/DeleteTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/DeleteTest.java
index 0699ad5b1..5884a2538 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/DeleteTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/DeleteTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class DeleteTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/ExecuteProcedureTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/ExecuteProcedureTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/ExecuteProcedureTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/ExecuteProcedureTest.java
index c2ad47411..d85056b0c 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/ExecuteProcedureTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/ExecuteProcedureTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ExecuteProcedureTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/ExplainTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/ExplainTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/ExplainTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/ExplainTest.java
index e56ee6bca..e82a700ca 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/ExplainTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/ExplainTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ExplainTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/InsertTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/InsertTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/InsertTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/InsertTest.java
index 0b7c54556..db8e173ed 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/InsertTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/InsertTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class InsertTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/MergeTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/MergeTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/MergeTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/MergeTest.java
index 0969f7a13..ced6e8869 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/MergeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/MergeTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import java.sql.PreparedStatement;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class MergeTest extends SqlTestBase {
     @Test
@@ -104,7 +105,7 @@ void testOthers() throws Exception {
         sql = "MERGE INTO MergeTest(name) KEY(id) VALUES('abc')";
         executeUpdateThanAssertErrorCode(sql, ErrorCode.COLUMN_CONTAINS_NULL_VALUES_1);
 
-        // 列必须一样多，否则:org.lealone.message.JdbcSQLException: Column count does not match;
+        // 列必须一样多，否则:com.lealone.message.JdbcSQLException: Column count does not match;
         sql = "MERGE INTO MergeTest(name) KEY(id) (SELECT * FROM tmpSelectTest)";
         executeUpdateThanAssertErrorCode(sql, ErrorCode.COLUMN_COUNT_DOES_NOT_MATCH);
     }
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/ScriptTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/ScriptTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/ScriptTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/ScriptTest.java
index 71a80887b..d0fcfef4c 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/ScriptTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/ScriptTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ScriptTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/SequenceLockedExceptionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/SequenceLockedExceptionTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/SequenceLockedExceptionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/SequenceLockedExceptionTest.java
index bc4ba3d21..4039040e2 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/SequenceLockedExceptionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/SequenceLockedExceptionTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import java.sql.Connection;
 import java.sql.Statement;
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class SequenceLockedExceptionTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/SetTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/SetTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/SetTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/SetTest.java
index 3a46e7d84..1c60e0733 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/SetTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/SetTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import java.sql.Connection;
 
 import org.junit.Test;
-import org.lealone.db.DbSetting;
-import org.lealone.db.session.SessionSetting;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.DbSetting;
+import com.lealone.db.session.SessionSetting;
+import com.lealone.test.sql.SqlTestBase;
 
 public class SetTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/TransactionStatementTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/TransactionStatementTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/TransactionStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/TransactionStatementTest.java
index 09de42ed6..8ab239b78 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/TransactionStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/TransactionStatementTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class TransactionStatementTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/dml/UpdateTest.java b/lealone-test/src/test/java/com/lealone/test/sql/dml/UpdateTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/dml/UpdateTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/dml/UpdateTest.java
index 1f556c3c9..191b997b8 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/dml/UpdateTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/dml/UpdateTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.dml;
+package com.lealone.test.sql.dml;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class UpdateTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/CompareLikeTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/CompareLikeTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/CompareLikeTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/CompareLikeTest.java
index 3713738f0..10e980a4c 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/CompareLikeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/CompareLikeTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class CompareLikeTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionExistsTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionExistsTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionExistsTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionExistsTest.java
index 4237e2606..4fc3e3cbb 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionExistsTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionExistsTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ConditionExistsTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInConstantSetTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInConstantSetTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInConstantSetTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInConstantSetTest.java
index f6236ac3a..54234e46d 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInConstantSetTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInConstantSetTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ConditionInConstantSetTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInSelectTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInSelectTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInSelectTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInSelectTest.java
index 3c1b054f3..5f10f8cbe 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInSelectTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInSelectTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInTest.java
index d20029af7..632c2d768 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ConditionInTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ConditionInTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ConditionInTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionColumnTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionColumnTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionColumnTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionColumnTest.java
index 0807ce08a..ba758622a 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionColumnTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionColumnTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ExpressionColumnTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionListTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionListTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionListTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionListTest.java
index 513b1d4fc..f843c0df9 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionListTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionListTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ExpressionListTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionTest.java
index 62430a132..0d48c6a33 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/ExpressionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/ExpressionTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class ExpressionTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/RownumTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/RownumTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/RownumTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/RownumTest.java
index 5fbf673e5..cd32342a3 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/RownumTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/RownumTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class RownumTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/SubQueryTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/SubQueryTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/SubQueryTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/SubQueryTest.java
index 78655ce58..1c36f6b2f 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/SubQueryTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/SubQueryTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class SubQueryTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/VariableTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/VariableTest.java
similarity index 88%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/VariableTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/VariableTest.java
index 51048990e..07787f6cb 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/VariableTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/VariableTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class VariableTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/expression/WildcardTest.java b/lealone-test/src/test/java/com/lealone/test/sql/expression/WildcardTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/expression/WildcardTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/expression/WildcardTest.java
index dc22a34dc..3eb632a58 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/expression/WildcardTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/expression/WildcardTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.expression;
+package com.lealone.test.sql.expression;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class WildcardTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/AggregateFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/AggregateFunctionTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/AggregateFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/AggregateFunctionTest.java
index 5d12ccc75..6f0bb4783 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/AggregateFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/AggregateFunctionTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import org.junit.Test;
-import org.lealone.test.db.schema.UserAggregateTest.MedianString;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.db.schema.UserAggregateTest.MedianString;
+import com.lealone.test.sql.SqlTestBase;
 
 //TODO 总共支持14个聚合函数，分布式场景下还有group_concat、selectivity、histogram这三个没有实现
 public class AggregateFunctionTest extends SqlTestBase {
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/DateTimeFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/DateTimeFunctionTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/DateTimeFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/DateTimeFunctionTest.java
index a9443fa16..35093e64c 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/DateTimeFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/DateTimeFunctionTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 //总共26个日期与时间函数
 public class DateTimeFunctionTest extends SqlTestBase {
@@ -32,7 +33,7 @@ void insert() throws Exception {
     void test0() throws Exception {
         sql = "SELECT " //
                 // 以下这21个日期与时间函数在这个方法中:
-                // org.lealone.expression.Function.getSimpleValue(Session, Value, Expression[], Value[])
+                // com.lealone.expression.Function.getSimpleValue(Session, Value, Expression[], Value[])
                 // ----------------------------------------------------------------------------------------
                 + "DAYNAME(d), " // 星期几，英文形式，如星期5是: Friday
                 + "DAY_OF_MONTH(d), " // 多少号
@@ -55,7 +56,7 @@ void test0() throws Exception {
                 + "CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP, NOW(), NOW(0), NOW(1), NOW(2), NOW(3), NOW(4), " // now后的数字是刻度
 
                 // 以下这5个日期与时间函数在这个方法中:
-                // org.lealone.expression.Function.getValueWithArgs(Session, Expression[])
+                // com.lealone.expression.Function.getValueWithArgs(Session, Expression[])
                 // ----------------------------------------------------------------------------------------
                 + "DATEADD('MONTH', 1, d), " //
                 + "DATEDIFF('YEAR', DATE '2001-01-31', DATE '1999-01-31'), " //
@@ -121,7 +122,7 @@ void test0() throws Exception {
     @Override
     protected void test() throws Exception {
         // 以下有21个日期与时间函数,
-        // 在这个方法中org.lealone.expression.Function.getSimpleValue(Session, Value, Expression[], Value[])
+        // 在这个方法中com.lealone.expression.Function.getSimpleValue(Session, Value, Expression[], Value[])
         // ----------------------------------------------------------------------------------------
         sql = "SELECT DAYNAME(DATE '2000-01-01')";
         sql = "SELECT DAY_OF_MONTH(CURRENT_DATE),DAY_OF_WEEK(CURRENT_DATE),DAY_OF_YEAR(CURRENT_DATE)";
@@ -154,7 +155,7 @@ protected void test() throws Exception {
         //
         //
         // 以下有5个日期与时间函数,
-        // 在这个方法中org.lealone.expression.Function.getValueWithArgs(Session, Expression[])
+        // 在这个方法中com.lealone.expression.Function.getValueWithArgs(Session, Expression[])
         // ----------------------------------------------------------------------------------------
 
         // 月份加1，结果是2001-02-28 00:00:00.0
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/JavaFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/JavaFunctionTest.java
similarity index 87%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/JavaFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/JavaFunctionTest.java
index c4fa0180a..72bd43daf 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/JavaFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/JavaFunctionTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import java.sql.ResultSet;
 import java.sql.Types;
 
 import org.junit.Test;
-import org.lealone.db.result.SimpleResultSet;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.result.SimpleResultSet;
+import com.lealone.test.sql.SqlTestBase;
 
 public class JavaFunctionTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/NumericFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/NumericFunctionTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/NumericFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/NumericFunctionTest.java
index e8fb905e0..773b830b9 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/NumericFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/NumericFunctionTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class NumericFunctionTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/StringFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/StringFunctionTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/StringFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/StringFunctionTest.java
index a4b66744f..e71258b83 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/StringFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/StringFunctionTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class StringFunctionTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/SystemFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/SystemFunctionTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/SystemFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/SystemFunctionTest.java
index 82382d39b..2dd49bfbc 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/SystemFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/SystemFunctionTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class SystemFunctionTest extends SqlTestBase {
 
@@ -85,10 +86,10 @@ private void testSystemFunction() throws Exception {
         // ROW_NUMBER函数虽然定义了，但ROW_NUMBER()函数无效，不支持这样的语法
         sql = "SELECT ROW_NUMBER()";
         // ROWNUM函数虽然没有定义，但ROWNUM()是有效，Parser在解析时把他当成ROWNUM伪字段处理
-        // 当成了org.lealone.expression.Rownum，见org.lealone.command.Parser.readTerm()
+        // 当成了com.lealone.expression.Rownum，见com.lealone.command.Parser.readTerm()
         sql = "SELECT ROWNUM()";
-        // 这样就没问题了,在这个方法中org.lealone.command.Parser.readFunction(Schema, String)
-        // 把ROW_NUMBER转成org.lealone.expression.Rownum了
+        // 这样就没问题了,在这个方法中com.lealone.command.Parser.readFunction(Schema, String)
+        // 把ROW_NUMBER转成com.lealone.expression.Rownum了
         sql = "SELECT ROW_NUMBER()OVER()";
 
         // 相等返回null，不相等返回v0
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/function/TableFunctionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/function/TableFunctionTest.java
similarity index 89%
rename from lealone-test/src/test/java/org/lealone/test/sql/function/TableFunctionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/function/TableFunctionTest.java
index 2c111a77f..5a806e1fe 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/function/TableFunctionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/function/TableFunctionTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.function;
+package com.lealone.test.sql.function;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class TableFunctionTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/index/AsyncIndexTest.java b/lealone-test/src/test/java/com/lealone/test/sql/index/AsyncIndexTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/index/AsyncIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/index/AsyncIndexTest.java
index 51d0846c1..28859f645 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/index/AsyncIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/index/AsyncIndexTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.index;
+package com.lealone.test.sql.index;
 
 import org.junit.Test;
-import org.lealone.db.Constants;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.Constants;
+import com.lealone.test.sql.SqlTestBase;
 
 public class AsyncIndexTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java b/lealone-test/src/test/java/com/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java
index d329f49d2..9be3aeb3d 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/index/AutoIncrementPrimaryIndexTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.index;
+package com.lealone.test.sql.index;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class AutoIncrementPrimaryIndexTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/index/DelegateIndexTest.java b/lealone-test/src/test/java/com/lealone/test/sql/index/DelegateIndexTest.java
similarity index 89%
rename from lealone-test/src/test/java/org/lealone/test/sql/index/DelegateIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/index/DelegateIndexTest.java
index 8fab035f4..4042b51e2 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/index/DelegateIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/index/DelegateIndexTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.index;
+package com.lealone.test.sql.index;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class DelegateIndexTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/index/IndexTest.java b/lealone-test/src/test/java/com/lealone/test/sql/index/IndexTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/index/IndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/index/IndexTest.java
index df2d44da7..dcfdf1a6c 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/index/IndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/index/IndexTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.index;
+package com.lealone.test.sql.index;
 
 import java.sql.Savepoint;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class IndexTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/index/MainIndexColumnTest.java b/lealone-test/src/test/java/com/lealone/test/sql/index/MainIndexColumnTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/sql/index/MainIndexColumnTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/index/MainIndexColumnTest.java
index 7ea073604..e9c08321f 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/index/MainIndexColumnTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/index/MainIndexColumnTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.index;
+package com.lealone.test.sql.index;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class MainIndexColumnTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/index/UniqueIndexTest.java b/lealone-test/src/test/java/com/lealone/test/sql/index/UniqueIndexTest.java
similarity index 90%
rename from lealone-test/src/test/java/org/lealone/test/sql/index/UniqueIndexTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/index/UniqueIndexTest.java
index 2d5403409..8cc3ef989 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/index/UniqueIndexTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/index/UniqueIndexTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.index;
+package com.lealone.test.sql.index;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class UniqueIndexTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/lock/DbObjectLockTest.java b/lealone-test/src/test/java/com/lealone/test/sql/lock/DbObjectLockTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/lock/DbObjectLockTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/lock/DbObjectLockTest.java
index 17b35c7a6..bcc9b1fbe 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/lock/DbObjectLockTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/lock/DbObjectLockTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.lock;
+package com.lealone.test.sql.lock;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class DbObjectLockTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/lock/DeadlockTest.java b/lealone-test/src/test/java/com/lealone/test/sql/lock/DeadlockTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/lock/DeadlockTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/lock/DeadlockTest.java
index 3c5190c32..d1d7bced3 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/lock/DeadlockTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/lock/DeadlockTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.lock;
+package com.lealone.test.sql.lock;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class DeadlockTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/lock/JdkReadWriteLockTest.java b/lealone-test/src/test/java/com/lealone/test/sql/lock/JdkReadWriteLockTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/lock/JdkReadWriteLockTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/lock/JdkReadWriteLockTest.java
index e1488d057..0d112d67f 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/lock/JdkReadWriteLockTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/lock/JdkReadWriteLockTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.lock;
+package com.lealone.test.sql.lock;
 
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/lock/RowLockTest.java b/lealone-test/src/test/java/com/lealone/test/sql/lock/RowLockTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/lock/RowLockTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/lock/RowLockTest.java
index b49c39a3d..95b04c896 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/lock/RowLockTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/lock/RowLockTest.java
@@ -3,16 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.lock;
+package com.lealone.test.sql.lock;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.common.util.JdbcUtils;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.common.util.JdbcUtils;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class RowLockTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/lock/TableLockTest.java b/lealone-test/src/test/java/com/lealone/test/sql/lock/TableLockTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/lock/TableLockTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/lock/TableLockTest.java
index 9652cef86..bada66166 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/lock/TableLockTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/lock/TableLockTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.lock;
+package com.lealone.test.sql.lock;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class TableLockTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/onlineddl/OnlineDDLTest.java b/lealone-test/src/test/java/com/lealone/test/sql/onlineddl/OnlineDDLTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/onlineddl/OnlineDDLTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/onlineddl/OnlineDDLTest.java
index 9e222c89c..4887bb4aa 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/onlineddl/OnlineDDLTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/onlineddl/OnlineDDLTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.onlineddl;
+package com.lealone.test.sql.onlineddl;
 
 import java.sql.ResultSet;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class OnlineDDLTest extends SqlTestBase {
     @Test
@@ -22,7 +23,7 @@ public void run() throws Exception {
         stmt.executeUpdate("CREATE VIEW IF NOT EXISTS test_view (v_f1,v_f2) AS SELECT f1,f2 FROM test");
         // stmt.executeUpdate("CREATE FORCE TRIGGER IF NOT EXISTS test_trigger"
         // + " BEFORE INSERT,UPDATE,DELETE,SELECT,ROLLBACK ON test"
-        // + " QUEUE 10 NOWAIT CALL \"org.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
+        // + " QUEUE 10 NOWAIT CALL \"com.lealone.test.db.schema.TriggerObjectTest$MyTrigger\"");
 
         stmt.executeUpdate("ALTER TABLE test ADD CONSTRAINT test_constraint_check CHECK (f1 > 1)");
         stmt.executeUpdate("ALTER TABLE test ADD CONSTRAINT test_constraint_unique UNIQUE KEY (f2)");
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/priority/StatementPriorityTest.java b/lealone-test/src/test/java/com/lealone/test/sql/priority/StatementPriorityTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/priority/StatementPriorityTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/priority/StatementPriorityTest.java
index 6d91aeff4..59cd757b6 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/priority/StatementPriorityTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/priority/StatementPriorityTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.priority;
+package com.lealone.test.sql.priority;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -11,9 +11,9 @@
 import java.sql.Statement;
 import java.util.Random;
 
-import org.lealone.common.util.JdbcUtils;
-import org.lealone.test.TestBase.MainTest;
-import org.lealone.test.sql.SqlTestBase;
+import com.lealone.common.util.JdbcUtils;
+import com.lealone.test.TestBase.MainTest;
+import com.lealone.test.sql.SqlTestBase;
 
 public class StatementPriorityTest extends SqlTestBase implements MainTest {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/DistinctQueryTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/DistinctQueryTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/DistinctQueryTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/DistinctQueryTest.java
index 650934b9b..9c4e7d00e 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/DistinctQueryTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/DistinctQueryTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class DistinctQueryTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/JoinTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/JoinTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/JoinTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/JoinTest.java
index 0787e7eb0..d7a18a95e 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/JoinTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/JoinTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class JoinTest extends SqlTestBase {
     @Test
@@ -75,7 +76,7 @@ protected void test() throws Exception {
 
         sql = "SELECT t1.id, t1.b FROM JoinTest1 t1 NATURAL JOIN JoinTest4 t2";
 
-        // org.lealone.table.TableFilter.next()
+        // com.lealone.table.TableFilter.next()
         // 打断点:table.getName().equalsIgnoreCase("JoinTest1") || table.getName().equalsIgnoreCase("JoinTest2")
         sql = "SELECT rownum, * FROM JoinTest1 LEFT OUTER JOIN JoinTest2 ON id>30";
         sql = "SELECT rownum, * FROM JoinTest1 RIGHT OUTER JOIN JoinTest2 ON id2>70";
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/PseudoColumnTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/PseudoColumnTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/PseudoColumnTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/PseudoColumnTest.java
index cbb8b0be2..31d4f764e 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/PseudoColumnTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/PseudoColumnTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class PseudoColumnTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/QuickAggregateQueryTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/QuickAggregateQueryTest.java
similarity index 96%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/QuickAggregateQueryTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/QuickAggregateQueryTest.java
index 56cc124a4..7c32ea3c4 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/QuickAggregateQueryTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/QuickAggregateQueryTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 // 对min、max、count三个聚合函数的特殊优化
 public class QuickAggregateQueryTest extends SqlTestBase {
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/SelectTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/SelectTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/SelectTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/SelectTest.java
index 314b98096..d581abeff 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/SelectTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/SelectTest.java
@@ -3,12 +3,13 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import java.sql.ResultSet;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class SelectTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/SelectUnionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/SelectUnionTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/SelectUnionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/SelectUnionTest.java
index aa184630c..b3dad0ebd 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/SelectUnionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/SelectUnionTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.test.sql.SqlTestBase;
 
 public class SelectUnionTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/query/ShowStatementTest.java b/lealone-test/src/test/java/com/lealone/test/sql/query/ShowStatementTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/sql/query/ShowStatementTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/query/ShowStatementTest.java
index ae5e235e4..e7b8c3098 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/query/ShowStatementTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/query/ShowStatementTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.query;
+package com.lealone.test.sql.query;
 
 import org.junit.Test;
-import org.lealone.db.LealoneDatabase;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.LealoneDatabase;
+import com.lealone.test.sql.SqlTestBase;
 
 public class ShowStatementTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/service/ServiceTest.java b/lealone-test/src/test/java/com/lealone/test/sql/service/ServiceTest.java
similarity index 91%
rename from lealone-test/src/test/java/org/lealone/test/sql/service/ServiceTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/service/ServiceTest.java
index 1c2bb36cf..3985ebd11 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/service/ServiceTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/service/ServiceTest.java
@@ -3,16 +3,17 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.service;
+package com.lealone.test.sql.service;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.db.api.ErrorCode;
-import org.lealone.db.service.ServiceSetting;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.api.ErrorCode;
+import com.lealone.db.service.ServiceSetting;
+import com.lealone.test.sql.SqlTestBase;
 
 public class ServiceTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/transaction/CommitTest.java b/lealone-test/src/test/java/com/lealone/test/sql/transaction/CommitTest.java
similarity index 86%
rename from lealone-test/src/test/java/org/lealone/test/sql/transaction/CommitTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/transaction/CommitTest.java
index 7bcde4f0f..52b5ffed1 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/transaction/CommitTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/transaction/CommitTest.java
@@ -3,11 +3,12 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.transaction;
+package com.lealone.test.sql.transaction;
 
 import org.junit.Test;
-import org.lealone.client.jdbc.JdbcStatement;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.client.jdbc.JdbcStatement;
+import com.lealone.test.sql.SqlTestBase;
 
 public class CommitTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/transaction/ReaCommittedTest.java b/lealone-test/src/test/java/com/lealone/test/sql/transaction/ReaCommittedTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/transaction/ReaCommittedTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/transaction/ReaCommittedTest.java
index f105a97d2..3a331d01c 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/transaction/ReaCommittedTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/transaction/ReaCommittedTest.java
@@ -3,15 +3,16 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.transaction;
+package com.lealone.test.sql.transaction;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.db.ConnectionSetting;
+import com.lealone.test.sql.SqlTestBase;
 
 public class ReaCommittedTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/transaction/RepeatableReadTest.java b/lealone-test/src/test/java/com/lealone/test/sql/transaction/RepeatableReadTest.java
similarity index 97%
rename from lealone-test/src/test/java/org/lealone/test/sql/transaction/RepeatableReadTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/transaction/RepeatableReadTest.java
index e8dbec94a..87adaa58f 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/transaction/RepeatableReadTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/transaction/RepeatableReadTest.java
@@ -3,14 +3,15 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.transaction;
+package com.lealone.test.sql.transaction;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class RepeatableReadTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/transaction/TransactionTest.java b/lealone-test/src/test/java/com/lealone/test/sql/transaction/TransactionTest.java
similarity index 98%
rename from lealone-test/src/test/java/org/lealone/test/sql/transaction/TransactionTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/transaction/TransactionTest.java
index ce63b92e8..594e38b23 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/transaction/TransactionTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/transaction/TransactionTest.java
@@ -3,7 +3,7 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.transaction;
+package com.lealone.test.sql.transaction;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -11,7 +11,8 @@
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class TransactionTest extends SqlTestBase {
 
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/transaction/TransactionalDDLTest.java b/lealone-test/src/test/java/com/lealone/test/sql/transaction/TransactionalDDLTest.java
similarity index 92%
rename from lealone-test/src/test/java/org/lealone/test/sql/transaction/TransactionalDDLTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/transaction/TransactionalDDLTest.java
index 468433821..152dc74b1 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/transaction/TransactionalDDLTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/transaction/TransactionalDDLTest.java
@@ -3,19 +3,19 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.transaction;
+package com.lealone.test.sql.transaction;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.Properties;
 
-import org.lealone.common.security.SHA256;
-import org.lealone.common.util.MathUtils;
-import org.lealone.common.util.StringUtils;
-import org.lealone.db.ConnectionSetting;
-import org.lealone.db.Constants;
-import org.lealone.test.TestBase.MainTest;
-import org.lealone.test.sql.SqlTestBase;
+import com.lealone.common.security.SHA256;
+import com.lealone.common.util.MathUtils;
+import com.lealone.common.util.StringUtils;
+import com.lealone.db.ConnectionSetting;
+import com.lealone.db.Constants;
+import com.lealone.test.TestBase.MainTest;
+import com.lealone.test.sql.SqlTestBase;
 
 public class TransactionalDDLTest extends SqlTestBase implements MainTest {
     public static void main(String[] args) throws Exception {
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/transaction/UpdateLossTest.java b/lealone-test/src/test/java/com/lealone/test/sql/transaction/UpdateLossTest.java
similarity index 95%
rename from lealone-test/src/test/java/org/lealone/test/sql/transaction/UpdateLossTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/transaction/UpdateLossTest.java
index 0cea5877b..74823273b 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/transaction/UpdateLossTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/transaction/UpdateLossTest.java
@@ -3,13 +3,14 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.transaction;
+package com.lealone.test.sql.transaction;
 
 import java.sql.Connection;
 import java.sql.Statement;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class UpdateLossTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/type/CollectionTypeTest.java b/lealone-test/src/test/java/com/lealone/test/sql/type/CollectionTypeTest.java
similarity index 94%
rename from lealone-test/src/test/java/org/lealone/test/sql/type/CollectionTypeTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/type/CollectionTypeTest.java
index 63fb60216..2cfd8b79d 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/type/CollectionTypeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/type/CollectionTypeTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.type;
+package com.lealone.test.sql.type;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class CollectionTypeTest extends SqlTestBase {
     @Test
diff --git a/lealone-test/src/test/java/org/lealone/test/sql/type/EnumTypeTest.java b/lealone-test/src/test/java/com/lealone/test/sql/type/EnumTypeTest.java
similarity index 93%
rename from lealone-test/src/test/java/org/lealone/test/sql/type/EnumTypeTest.java
rename to lealone-test/src/test/java/com/lealone/test/sql/type/EnumTypeTest.java
index 3e291a84a..23b7fe28d 100644
--- a/lealone-test/src/test/java/org/lealone/test/sql/type/EnumTypeTest.java
+++ b/lealone-test/src/test/java/com/lealone/test/sql/type/EnumTypeTest.java
@@ -3,10 +3,11 @@
  * Licensed under the Server Side Public License, v 1.
  * Initial Developer: zhh
  */
-package org.lealone.test.sql.type;
+package com.lealone.test.sql.type;
 
 import org.junit.Test;
-import org.lealone.test.sql.SqlTestBase;
+
+import com.lealone.test.sql.SqlTestBase;
 
 public class EnumTypeTest extends SqlTestBase {
     @Test
diff --git a/pom.xml b/pom.xml
index 1a674a07e..fdf9210c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     4.0.0
 
     lealone database project
-    org.lealone
+    com.lealone
     lealone
     pom
     6.0.0-SNAPSHOT
@@ -165,7 +165,7 @@
             
                 
                     
-                        org.lealone
+                        com.lealone
                         lealone-main
                         ${project.version}