diff --git a/group02/812350401/.gitignore b/group02/812350401/.gitignore
index c24866af6d..0a2df7bbee 100644
--- a/group02/812350401/.gitignore
+++ b/group02/812350401/.gitignore
@@ -1,3 +1,4 @@
-/bin/
-/lib/
-/src/java_training
+target/
+.idea/
+src/main/java/train/
+src/main/resources/
\ No newline at end of file
diff --git a/group02/812350401/pom.xml b/group02/812350401/pom.xml
new file mode 100644
index 0000000000..9a637781ce
--- /dev/null
+++ b/group02/812350401/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>coding2017</groupId>
+    <artifactId>812350401</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/dom4j/dom4j -->
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/ArrayList.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/ArrayList.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/ArrayList.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/ArrayList.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/BinaryTreeNode.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/BinaryTreeNode.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/BinaryTreeNode.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/BinaryTreeNode.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/Iterator.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/Iterator.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/Iterator.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/Iterator.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/IteratorImp.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/IteratorImp.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/IteratorImp.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/IteratorImp.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/LinkedList.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/LinkedList.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/LinkedList.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/LinkedList.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/List.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/List.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/List.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/List.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/Queue.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/Queue.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/Queue.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/Queue.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/Stack.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/Stack.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/Stack.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/basic/Stack.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/array/ArrayUtil.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/array/ArrayUtil.java
similarity index 96%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/array/ArrayUtil.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/array/ArrayUtil.java
index 5d7ad8f4d3..41bc6ad344 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/array/ArrayUtil.java
+++ b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/array/ArrayUtil.java
@@ -171,7 +171,7 @@ private int[] getFactors(int num) {
 	 * 例如array= [3,8,9], seperator = "-"
 	 * 则返回值为"3-8-9"
 	 * @param array
-	 * @param s
+	 * @param seperator
 	 * @return
 	 */
 	public String join(int[] array, String seperator){
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/DownloadThread.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/DownloadThread.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/DownloadThread.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/DownloadThread.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/FileDownloader.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/FileDownloader.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/FileDownloader.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/FileDownloader.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/Connection.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/Connection.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/Connection.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/Connection.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionException.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionException.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionException.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionException.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionManager.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionManager.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionManager.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/ConnectionManager.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/DownloadListener.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/DownloadListener.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/api/DownloadListener.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/api/DownloadListener.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImpl.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImpl.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImpl.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImpl.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionManagerImpl.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionManagerImpl.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionManagerImpl.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionManagerImpl.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/LoginAction.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/LoginAction.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/LoginAction.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/LoginAction.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/LogoutAction.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/LogoutAction.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/LogoutAction.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/LogoutAction.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/Struts.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/Struts.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/Struts.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/Struts.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/View.java b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/View.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/View.java
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/View.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/struts.xml b/group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/struts.xml
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/struts.xml
rename to group02/812350401/src/main/java/com/github/miniyk2012/coding2017/coderising/litestruts/struts.xml
diff --git a/group02/812350401/src/utils/ArrayUtils.java b/group02/812350401/src/main/java/utils/ArrayUtils.java
similarity index 100%
rename from group02/812350401/src/utils/ArrayUtils.java
rename to group02/812350401/src/main/java/utils/ArrayUtils.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ArrayListTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/ArrayListTest.java
similarity index 57%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ArrayListTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/ArrayListTest.java
index b308c6bfef..934ecedcb2 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ArrayListTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/ArrayListTest.java
@@ -1,7 +1,6 @@
-package com.github.miniyk2012.coding2017.basic.test;
+package com.github.miniyk2012.coding2017.basic;
 
 import org.junit.Before;
-import com.github.miniyk2012.coding2017.basic.ArrayList;
 
 
 public class ArrayListTest extends ListTest {
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/BinaryTreeNodeTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/BinaryTreeNodeTest.java
similarity index 97%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/BinaryTreeNodeTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/BinaryTreeNodeTest.java
index 698506e2b5..205fbe3bb5 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/BinaryTreeNodeTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/BinaryTreeNodeTest.java
@@ -1,4 +1,4 @@
-package com.github.miniyk2012.coding2017.basic.test;
+package com.github.miniyk2012.coding2017.basic;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/LinkedListTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/LinkedListTest.java
similarity index 98%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/LinkedListTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/LinkedListTest.java
index 199e6a9a12..5ee2df36a2 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/LinkedListTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/LinkedListTest.java
@@ -1,4 +1,4 @@
-package com.github.miniyk2012.coding2017.basic.test;
+package com.github.miniyk2012.coding2017.basic;
 
 import static org.junit.Assert.*;
 
@@ -6,9 +6,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.github.miniyk2012.coding2017.basic.Iterator;
-import com.github.miniyk2012.coding2017.basic.LinkedList;
-
 
 public class LinkedListTest extends ListTest{
 
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ListTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/ListTest.java
similarity index 97%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ListTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/ListTest.java
index b9f32fcc3b..87a8cdddb3 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ListTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/ListTest.java
@@ -1,4 +1,4 @@
-package com.github.miniyk2012.coding2017.basic.test;
+package com.github.miniyk2012.coding2017.basic;
 
 import static org.junit.Assert.*;
 
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/QueueTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/QueueTest.java
similarity index 92%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/QueueTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/QueueTest.java
index 67035c1dcf..132334066a 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/QueueTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/QueueTest.java
@@ -1,4 +1,4 @@
-package com.github.miniyk2012.coding2017.basic.test;
+package com.github.miniyk2012.coding2017.basic;
 
 import static org.junit.Assert.*;
 import org.junit.Before;
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/StackTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/StackTest.java
similarity index 92%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/StackTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/StackTest.java
index a9b4e14afd..9fdde63598 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/StackTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/basic/StackTest.java
@@ -1,4 +1,4 @@
-package com.github.miniyk2012.coding2017.basic.test;
+package com.github.miniyk2012.coding2017.basic;
 
 import static org.junit.Assert.*;
 
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/array/test/ArrayUtilTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/array/ArrayUtilTest.java
similarity index 98%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/array/test/ArrayUtilTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/array/ArrayUtilTest.java
index 58de9f3efb..5e72c9ab5d 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/array/test/ArrayUtilTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/array/ArrayUtilTest.java
@@ -1,4 +1,4 @@
-package com.github.miniyk2012.coding2017.coderising.array.test;
+package com.github.miniyk2012.coding2017.coderising.array;
 
 import static org.junit.Assert.*;
 
diff --git a/group02/812350401/src/test/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImplTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/download/ConnectionImplTest.java
similarity index 86%
rename from group02/812350401/src/test/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImplTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/download/ConnectionImplTest.java
index 6007cf7b94..96892a86df 100644
--- a/group02/812350401/src/test/com/github/miniyk2012/coding2017/coderising/download/impl/ConnectionImplTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/download/ConnectionImplTest.java
@@ -1,13 +1,10 @@
-package test.com.github.miniyk2012.coding2017.coderising.download.impl; 
+package com.github.miniyk2012.coding2017.coderising.download;
 
 import com.github.miniyk2012.coding2017.coderising.download.api.Connection;
-import com.github.miniyk2012.coding2017.coderising.download.impl.ConnectionImpl;
 import com.github.miniyk2012.coding2017.coderising.download.impl.ConnectionManagerImpl;
-import org.junit.Test;
-import org.junit.Before; 
 import org.junit.After;
-
-import java.net.URL;
+import org.junit.Before;
+import org.junit.Test;
 
 /** 
 * ConnectionImpl Tester. 
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/FileDownloaderTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/download/FileDownloaderTest.java
similarity index 100%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/download/FileDownloaderTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/download/FileDownloaderTest.java
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/StrutsTest.java b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/litestruts/StrutsTest.java
similarity index 97%
rename from group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/StrutsTest.java
rename to group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/litestruts/StrutsTest.java
index 9443a32d97..15e569a766 100644
--- a/group02/812350401/src/com/github/miniyk2012/coding2017/coderising/litestruts/StrutsTest.java
+++ b/group02/812350401/src/test/java/com/github/miniyk2012/coding2017/coderising/litestruts/StrutsTest.java
@@ -10,9 +10,6 @@
 import org.junit.Test;
 
 
-
-
-
 public class StrutsTest {
 
 	@Test