diff --git a/docs/Documentation/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/2-MapReduce TsFile.md
similarity index 99%
rename from docs/Documentation/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/2-MapReduce TsFile.md
index 9a6834bb0f3cd1521b415089e1b9a7b4c45865de..5029ce40b9134009acdde816d668da3a8d0b2c3f 100644
--- a/docs/Documentation/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md	
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/2-MapReduce TsFile.md	
@@ -168,7 +168,6 @@ Then, the `mapper` and `reducer` class is how you deal with the `MapWritable` pr
 
 ```
     public static class TSMapper extends Mapper<NullWritable, MapWritable, Text, MapWritable> {
-
         @Override
         protected void map(NullWritable key, MapWritable value,
                            Mapper<NullWritable, MapWritable, Text, MapWritable>.Context context)
diff --git a/docs/Documentation/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/3-Spark TsFile.md
similarity index 100%
rename from docs/Documentation/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/3-Spark TsFile.md
diff --git a/docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB.md
similarity index 97%
rename from docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB.md
index 4d7aa1903abdcc4f1a6566ba2e6a606496d096d9..1bb3640b5405e2abce9ac6fd21cb46e53518abc1 100644
--- a/docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md	
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB.md	
@@ -49,7 +49,7 @@ mvn clean scala:compile compile install
 ```
 spark-shell --jars spark-iotdb-connector-0.9.0-SNAPSHOT.jar,iotdb-jdbc-0.9.0-SNAPSHOT-jar-with-dependencies.jar
 
-import org.apache.iotdb.sparkdb._
+import org.apache.iotdb.spark.db._
 
 val df = spark.read.format("org.apache.iotdb.sparkdb").option("url","jdbc:iotdb://127.0.0.1:6667/").option("sql","select * from root").load
 
@@ -62,7 +62,7 @@ df.show()
 ```
 spark-shell --jars spark-iotdb-connector-0.9.0-SNAPSHOT.jar,iotdb-jdbc-0.9.0-SNAPSHOT-jar-with-dependencies.jar
 
-import org.apache.iotdb.sparkdb._
+import org.apache.iotdb.spark.db._
 
 val df = spark.read.format("org.apache.iotdb.sparkdb").option("url","jdbc:iotdb://127.0.0.1:6667/").option("sql","select * from root").
                         option("lowerBound", [lower bound of time that you want query(include)]).option("upperBound", [upper bound of time that you want query(include)]).
@@ -129,7 +129,7 @@ You can also use narrow table form which as follows: (You can see part 4 about h
 
 ## from wide to narrow
 ```
-import org.apache.iotdb.sparkdb._
+import org.apache.iotdb.spark.db._
 
 val wide_df = spark.read.format("org.apache.iotdb.sparkdb").option("url", "jdbc:iotdb://127.0.0.1:6667/").option("sql", "select * from root where time < 1100 and time > 1000").load
 val narrow_df = Transformer.toNarrowForm(spark, wide_df)
@@ -137,7 +137,7 @@ val narrow_df = Transformer.toNarrowForm(spark, wide_df)
 
 ## from narrow to wide
 ```
-import org.apache.iotdb.sparkdb._
+import org.apache.iotdb.spark.db._
 
 val wide_df = Transformer.toWideForm(spark, narrow_df)
 ```
@@ -147,7 +147,7 @@ val wide_df = Transformer.toWideForm(spark, narrow_df)
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.SparkSession;
-import org.apache.iotdb.sparkdb.*
+import org.apache.iotdb.spark.db.*
 
 public class Example {
 
diff --git a/docs/Documentation/UserGuide/7-Ecosystem Integration/5-TsFile Hive Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/5-Hive TsFile.md
similarity index 100%
rename from docs/Documentation/UserGuide/7-Ecosystem Integration/5-TsFile Hive Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/5-Hive TsFile.md
diff --git a/spark-iotdb-connector/src/main/java/org/apache/iotdb/sparkdb/SQLConstant.java b/spark-iotdb-connector/src/main/java/org/apache/iotdb/spark/db/SQLConstant.java
similarity index 96%
rename from spark-iotdb-connector/src/main/java/org/apache/iotdb/sparkdb/SQLConstant.java
rename to spark-iotdb-connector/src/main/java/org/apache/iotdb/spark/db/SQLConstant.java
index a69bba5fa044e4dfd4282fee6668f803cb861ff6..5e893cf1760c995d34225b22e1c614ff68e58814 100644
--- a/spark-iotdb-connector/src/main/java/org/apache/iotdb/sparkdb/SQLConstant.java
+++ b/spark-iotdb-connector/src/main/java/org/apache/iotdb/spark/db/SQLConstant.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.sparkdb;
+package org.apache.iotdb.spark.db;
 
 /**
  * this class contains several constants used in SQL.
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Converter.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/Converter.scala
similarity index 98%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Converter.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/Converter.scala
index 80567cce39c303169d937564b6945b2423609047..936bd7827bd9d8b5bf17165e3d3dd19bd0757c0e 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Converter.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/Converter.scala
@@ -16,7 +16,7 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
 import java.sql.{Statement, _}
 
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/DefaultSource.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/DefaultSource.scala
similarity index 97%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/DefaultSource.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/DefaultSource.scala
index cf82c7d495ca27a2f10360398688f17230d7ddce..253fba00ce00740653512f6d05fb7c9a57b44b39 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/DefaultSource.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/DefaultSource.scala
@@ -16,7 +16,7 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
 import org.apache.spark.sql.SQLContext
 import org.apache.spark.sql.sources.{BaseRelation, DataSourceRegister, RelationProvider}
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBOptions.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBOptions.scala
similarity index 97%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBOptions.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBOptions.scala
index c595ed5486888c8200b9601f1080029948f4054c..d994cb1140498d8f8f607a2c4cd44114b6cd7453 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBOptions.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBOptions.scala
@@ -16,7 +16,7 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
 class IoTDBOptions(
                     @transient private val parameters: Map[String, String])
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRDD.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBRDD.scala
similarity index 99%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRDD.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBRDD.scala
index 1c45dc80e4c9bfb058ef538cfa0b018d1c3e9452..75f65b59595346acba13091e3d258af8210a27f9 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRDD.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBRDD.scala
@@ -16,15 +16,15 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
-import org.apache.spark.{Partition, SparkContext, TaskContext}
-import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.sources._
 import java.sql.{Connection, DriverManager, ResultSet, Statement}
 
+import org.apache.spark.rdd.RDD
 import org.apache.spark.sql.Row
+import org.apache.spark.sql.sources._
 import org.apache.spark.sql.types._
+import org.apache.spark.{Partition, SparkContext, TaskContext}
 
 
 //IoTDB data partition
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRelation.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBRelation.scala
similarity index 99%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRelation.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBRelation.scala
index bf30ebbc512d6cd6193088d952f7c788d5ae533d..927ac0dbf3eab04f027b1c899a5cf3af1ea91d27 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRelation.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/IoTDBRelation.scala
@@ -16,7 +16,7 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
 import org.apache.spark.Partition
 import org.apache.spark.rdd.RDD
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Transformer.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/Transformer.scala
similarity index 99%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Transformer.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/Transformer.scala
index ae47fed4c60b819b54638d466fb74bd91656d41d..1c2c89b4dd3e34ffec79fba4256586b70b101537 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Transformer.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/Transformer.scala
@@ -16,7 +16,7 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
 import org.apache.spark.sql.{SparkSession, _}
 import org.apache.spark.sql.types._
diff --git a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/package.scala b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/package.scala
similarity index 91%
rename from spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/package.scala
rename to spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/package.scala
index 7d946e1cb2686c11519d94bb792c2ad696818d4e..37514bdbd5ec8c4e1bba310db87b10b8b26f3f5d 100644
--- a/spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/package.scala
+++ b/spark-iotdb-connector/src/main/scala/org/apache/iotdb/spark/db/package.scala
@@ -16,13 +16,13 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark
 
 import org.apache.spark.sql.{DataFrame, DataFrameReader}
 
-package object sparkdb {
+package object db {
 
-  val myPackage = "org.apache.iotdb.sparkdb"
+  val myPackage = "org.apache.iotdb.spark.db"
 
   /**
     * Adds a method, `iotdb`, to DataFrameReader that allows you to read data from IoTDB using
diff --git a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/EnvironmentUtils.java b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
similarity index 99%
rename from spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/EnvironmentUtils.java
rename to spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
index de4a6a4d1adf4906b74a14a14f793e11b4bdd783..92222d70e57bde4aa25f555c3bd0150fb789b018 100644
--- a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/EnvironmentUtils.java
+++ b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.sparkdb;
+package org.apache.iotdb.spark.db;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/IoTDBTest.scala b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/IoTDBTest.scala
similarity index 99%
rename from spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/IoTDBTest.scala
rename to spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/IoTDBTest.scala
index 48418fb46aacda1c0274575f1b4caf6e09bcd408..3777bae2774821e7d6e65eedd9150585e62dd72c 100644
--- a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/IoTDBTest.scala
+++ b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/IoTDBTest.scala
@@ -16,7 +16,7 @@
   * specific language governing permissions and limitations
   * under the License.
   */
-package org.apache.iotdb.sparkdb
+package org.apache.iotdb.spark.db
 
 import java.io.ByteArrayOutputStream
 
diff --git a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/package.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/package.scala
index f302aac168384d081418e519ccdd513f6ff62493..21d5d872a0317e7f5de1db41833085f4453a08d7 100755
--- a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/package.scala
+++ b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/package.scala
@@ -33,10 +33,10 @@ package object tsfile {
                isNarrowForm: Boolean = false): DataFrame = {
       if (isNarrowForm) {
         reader.option(DefaultSource.path, path).option(DefaultSource.isNarrowForm, "narrow_form").
-          format("org.apache.iotdb.tsfile").load
+          format("org.apache.iotdb.spark.tsfile").load
       }
       else {
-        reader.option(DefaultSource.path, path).format("org.apache.iotdb.tsfile").load
+        reader.option(DefaultSource.path, path).format("org.apache.iotdb.spark.tsfile").load
       }
     }
   }
@@ -49,7 +49,7 @@ package object tsfile {
                isNarrowForm: Boolean = false): Unit = {
       if (isNarrowForm) {
         writer.option(DefaultSource.path, path).option(DefaultSource.isNarrowForm, "narrow_form").
-          format("org.apache.iotdb.tsfile").save
+          format("org.apache.iotdb.spark.tsfile").save
       }
       else {
         writer.option(DefaultSource.path, path).format("org.apache.iotdb.tsfile").save
diff --git a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala
index d9ea35e5be9be2dc6f64a67e920e43bc9f29be25..fe5b1c89e48715908b43268d5e35189f223f2bd0 100644
--- a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala
+++ b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tsfile/TSFileSuit.scala
@@ -20,6 +20,7 @@ package org.apache.iotdb.spark.tsfile
 
 import java.io.{ByteArrayOutputStream, File}
 import java.net.URI
+import java.util
 
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.Path
@@ -376,8 +377,9 @@ device_2: 400000 rows, time range [0,799998], interval 2
         "|131047|device_1   |null    |131047  |null    |\n" +
         "|131048|device_1   |null    |131048  |null    |\n" +
         "|131049|device_1   |null    |131049  |null    |\n" +
-        "+------+-----------+--------+--------+--------+\n"
+        "+------+-----------+--------+--------+--------+"
 
+    println("???" + util.Arrays.toString(actual))
     Assert.assertArrayEquals(expect.toCharArray, actual.dropRight(2))
 
     reader.close() // DO NOT FORGET THIS