diff --git a/pom.xml b/pom.xml
index c29c3bd..1297337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.test.failure.ignore>true</maven.test.failure.ignore>
     <maven.test.skip>true</maven.test.skip>
-    <jdk.version>1.5</jdk.version>
+    <jdk.version>1.6</jdk.version>
   </properties>
 
   <build>
diff --git a/src/main/java/org/csource/fastdfs/test/DownloadFileWriter.java b/src/test/java/org/csource/fastdfs/DownloadFileWriter.java
similarity index 97%
rename from src/main/java/org/csource/fastdfs/test/DownloadFileWriter.java
rename to src/test/java/org/csource/fastdfs/DownloadFileWriter.java
index d2a4f83..2948f2c 100644
--- a/src/main/java/org/csource/fastdfs/test/DownloadFileWriter.java
+++ b/src/test/java/org/csource/fastdfs/DownloadFileWriter.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  */
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.fastdfs.DownloadCallback;
 
diff --git a/src/main/java/org/csource/fastdfs/test/Monitor.java b/src/test/java/org/csource/fastdfs/Monitor.java
similarity index 99%
rename from src/main/java/org/csource/fastdfs/test/Monitor.java
rename to src/test/java/org/csource/fastdfs/Monitor.java
index 6e437ec..30f86e7 100644
--- a/src/main/java/org/csource/fastdfs/test/Monitor.java
+++ b/src/test/java/org/csource/fastdfs/Monitor.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.fastdfs.*;
 
diff --git a/src/main/java/org/csource/fastdfs/test/Test.java b/src/test/java/org/csource/fastdfs/Test.java
similarity index 98%
rename from src/main/java/org/csource/fastdfs/test/Test.java
rename to src/test/java/org/csource/fastdfs/Test.java
index d97f974..612716e 100644
--- a/src/main/java/org/csource/fastdfs/test/Test.java
+++ b/src/test/java/org/csource/fastdfs/Test.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
diff --git a/src/main/java/org/csource/fastdfs/test/Test1.java b/src/test/java/org/csource/fastdfs/Test1.java
similarity index 97%
rename from src/main/java/org/csource/fastdfs/test/Test1.java
rename to src/test/java/org/csource/fastdfs/Test1.java
index f236fd9..2573f59 100644
--- a/src/main/java/org/csource/fastdfs/test/Test1.java
+++ b/src/test/java/org/csource/fastdfs/Test1.java
@@ -1,4 +1,4 @@
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
diff --git a/src/main/java/org/csource/fastdfs/test/TestAppender.java b/src/test/java/org/csource/fastdfs/TestAppender.java
similarity index 99%
rename from src/main/java/org/csource/fastdfs/test/TestAppender.java
rename to src/test/java/org/csource/fastdfs/TestAppender.java
index 4a3d04e..5eb34b4 100644
--- a/src/main/java/org/csource/fastdfs/test/TestAppender.java
+++ b/src/test/java/org/csource/fastdfs/TestAppender.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
diff --git a/src/main/java/org/csource/fastdfs/test/TestAppender1.java b/src/test/java/org/csource/fastdfs/TestAppender1.java
similarity index 99%
rename from src/main/java/org/csource/fastdfs/test/TestAppender1.java
rename to src/test/java/org/csource/fastdfs/TestAppender1.java
index e64e78e..c2c5278 100644
--- a/src/main/java/org/csource/fastdfs/test/TestAppender1.java
+++ b/src/test/java/org/csource/fastdfs/TestAppender1.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
diff --git a/src/main/java/org/csource/fastdfs/test/TestClient.java b/src/test/java/org/csource/fastdfs/TestClient.java
similarity index 99%
rename from src/main/java/org/csource/fastdfs/test/TestClient.java
rename to src/test/java/org/csource/fastdfs/TestClient.java
index 3ef03a4..b9106f7 100644
--- a/src/main/java/org/csource/fastdfs/test/TestClient.java
+++ b/src/test/java/org/csource/fastdfs/TestClient.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
diff --git a/src/main/java/org/csource/fastdfs/test/TestClient1.java b/src/test/java/org/csource/fastdfs/TestClient1.java
similarity index 99%
rename from src/main/java/org/csource/fastdfs/test/TestClient1.java
rename to src/test/java/org/csource/fastdfs/TestClient1.java
index ff241b8..663b571 100644
--- a/src/main/java/org/csource/fastdfs/test/TestClient1.java
+++ b/src/test/java/org/csource/fastdfs/TestClient1.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
 import org.csource.fastdfs.*;
diff --git a/src/main/java/org/csource/fastdfs/test/TestLoad.java b/src/test/java/org/csource/fastdfs/TestLoad.java
similarity index 99%
rename from src/main/java/org/csource/fastdfs/test/TestLoad.java
rename to src/test/java/org/csource/fastdfs/TestLoad.java
index bae9ff3..f3bab37 100644
--- a/src/main/java/org/csource/fastdfs/test/TestLoad.java
+++ b/src/test/java/org/csource/fastdfs/TestLoad.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  **/
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.fastdfs.*;
 
diff --git a/src/main/java/org/csource/fastdfs/test/UploadLocalFileSender.java b/src/test/java/org/csource/fastdfs/UploadLocalFileSender.java
similarity index 97%
rename from src/main/java/org/csource/fastdfs/test/UploadLocalFileSender.java
rename to src/test/java/org/csource/fastdfs/UploadLocalFileSender.java
index 653c79a..f04c366 100644
--- a/src/main/java/org/csource/fastdfs/test/UploadLocalFileSender.java
+++ b/src/test/java/org/csource/fastdfs/UploadLocalFileSender.java
@@ -6,7 +6,7 @@
  * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
  */
 
-package org.csource.fastdfs.test;
+package org.csource.fastdfs;
 
 import org.csource.fastdfs.UploadCallback;