diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/test/BinaryTreeNodeTest.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/test/BinaryTreeNodeTest.java
index 4b2fe88ee0..585bbd7e6a 100644
--- a/group24/121111914/src/com/github/ipk2015/coding2017/basic/test/BinaryTreeNodeTest.java
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/test/BinaryTreeNodeTest.java
@@ -5,7 +5,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.github.ipk2015.coding2017.basic.BinaryTreeNode;
+import com.github.ipk2015.coding2017.basic.tree.BinaryTreeNode1;
+
+
 
 public class BinaryTreeNodeTest {
 
@@ -15,7 +17,7 @@ public void setUp() throws Exception {
 
 	@Test
 	public void testInsert() {
-		BinaryTreeNode node=new BinaryTreeNode();
+		BinaryTreeNode1 node=new BinaryTreeNode1();
 		
 		node.setData(5);
 		node.insert(2);
diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeNode.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeNode.java
new file mode 100644
index 0000000000..7da18fa204
--- /dev/null
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeNode.java
@@ -0,0 +1,70 @@
+package com.github.ipk2015.coding2017.basic.tree;
+
+
+
+public class BinaryTreeNode<T> {
+	
+	private T data;
+	private BinaryTreeNode<T> left;
+	private BinaryTreeNode<T> right;
+	
+	public BinaryTreeNode(T data){
+		this.data=data;
+	}
+	public BinaryTreeNode(){
+		
+	}
+	public T getData() {
+		return data;
+	}
+	public void setData(T data) {
+		this.data = data;
+	}
+	public BinaryTreeNode<T> getLeft() {
+		return left;
+	}
+	public void setLeft(BinaryTreeNode<T> left) {
+		this.left = left;
+	}
+	public BinaryTreeNode<T> getRight() {
+		return right;
+	}
+	public void setRight(BinaryTreeNode<T> right) {
+		this.right = right;
+	}
+	
+	public BinaryTreeNode<T> insert(T o){
+		BinaryTreeNode insertNode=new BinaryTreeNode(o);
+		BinaryTreeNode compareNode=this;
+		
+		while(null!=compareNode){
+			if(null==compareNode.getData()){
+				compareNode.setData(o);
+				break;
+			}else{
+				Comparable com=(Comparable) compareNode.getData();
+				
+				int result = com.compareTo(o);
+				
+				if(result==0){
+					break;
+				}else if(result>0){
+					if(null==compareNode.getLeft()){
+						compareNode.setLeft(insertNode);
+						break;
+					}
+					compareNode=compareNode.getLeft();
+				}else if(result<0){
+					if(null==compareNode.getRight()){
+						compareNode.setRight(insertNode);
+						break;
+					}
+					compareNode=compareNode.getRight();
+				}
+			}
+		}
+		
+		return  insertNode;
+	}
+	
+}
diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/BinaryTreeNode.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeNode1.java
similarity index 65%
rename from group24/121111914/src/com/github/ipk2015/coding2017/basic/BinaryTreeNode.java
rename to group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeNode1.java
index 9fbcb7f585..a6f0c96a12 100644
--- a/group24/121111914/src/com/github/ipk2015/coding2017/basic/BinaryTreeNode.java
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeNode1.java
@@ -1,10 +1,10 @@
-package com.github.ipk2015.coding2017.basic;
+package com.github.ipk2015.coding2017.basic.tree;
 
-public class BinaryTreeNode {
+public class BinaryTreeNode1 {
 	
 	private Comparable data;
-	private BinaryTreeNode left;
-	private BinaryTreeNode right;
+	private BinaryTreeNode1 left;
+	private BinaryTreeNode1 right;
 	
 	public Object getData() {
 		return data;
@@ -12,22 +12,22 @@ public Object getData() {
 	public void setData(Comparable data) {
 		this.data = data;
 	}
-	public BinaryTreeNode getLeft() {
+	public BinaryTreeNode1 getLeft() {
 		return left;
 	}
-	public void setLeft(BinaryTreeNode left) {
+	public void setLeft(BinaryTreeNode1 left) {
 		this.left = left;
 	}
-	public BinaryTreeNode getRight() {
+	public BinaryTreeNode1 getRight() {
 		return right;
 	}
-	public void setRight(BinaryTreeNode right) {
+	public void setRight(BinaryTreeNode1 right) {
 		this.right = right;
 	}
 	
-	public BinaryTreeNode insert(Comparable o){
-		BinaryTreeNode insertNode=new BinaryTreeNode();
-		BinaryTreeNode compareNode=this;
+	public BinaryTreeNode1 insert(Comparable o){
+		BinaryTreeNode1 insertNode=new BinaryTreeNode1();
+		BinaryTreeNode1 compareNode=this;
 		insertNode.setData(o);
 		
 		while(null!=compareNode){
diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeUtil.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeUtil.java
new file mode 100644
index 0000000000..268e00ddd8
--- /dev/null
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeUtil.java
@@ -0,0 +1,183 @@
+package com.github.ipk2015.coding2017.basic.tree;
+
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+/*
+ * 二叉树的遍历
+                    对于二叉树的遍历方式一般分为三种先序、中序、后序三种方式
+                 先序遍历
+                  若二叉树为空，则不进行任何操作：否则
+                       1、访问根结点。
+                       2、先序方式遍历左子树。
+                       3、先序遍历右子树。
+                中序遍历
+                  若二叉树为空，则不进行任何操作：否则
+                       1、中序遍历左子树。
+                       2、访问根结点。
+                       3、中序遍历右子树。
+               后序遍历
+                  若二叉树为空，则不进行任何操作：否则
+                       1、后序遍历左子树。
+                       2、后序遍历右子树。
+                       3、访问根结点。
+ * */
+public class BinaryTreeUtil {
+	/**
+	 * 用递归的方式实现对二叉树的前序遍历， 需要通过BinaryTreeUtilTest测试
+	 * 
+	 * @param root
+	 * @return
+	 */
+	public static <T> List<T> preOrderVisit(BinaryTreeNode<T> root) {
+		List<T> result = new ArrayList<T>();
+		preOrderNode(root,result);
+		return result;
+	}
+	private static <T> void preOrderNode(BinaryTreeNode<T> node,List<T> list){
+		if(null == node){
+			return;
+		}
+		
+		T data = node.getData();
+		if(null != data){
+			list.add(data);
+		}
+		
+		BinaryTreeNode<T> leftNode = node.getLeft();
+		preOrderNode(leftNode,list);
+		
+		BinaryTreeNode<T> rightNode = node.getRight();
+		preOrderNode(rightNode,list);
+	}
+	/**
+	 * 用递归的方式实现对二叉树的中遍历
+	 * 
+	 * @param root
+	 * @return
+	 */
+	public static <T> List<T> inOrderVisit(BinaryTreeNode<T> root) {
+		List<T> result = new ArrayList<T>();
+		inOrderNode(root,result);
+		return result;
+	}
+
+	private static <T> void inOrderNode(BinaryTreeNode<T> node,List<T> list){
+		if(null == node){
+			return;
+		}
+		
+		BinaryTreeNode<T> leftNode = node.getLeft();
+		inOrderNode(leftNode,list);
+		
+		T data = node.getData();
+		if(null != data){
+			list.add(data);
+		}
+		
+		BinaryTreeNode<T> rightNode = node.getRight();
+		inOrderNode(rightNode,list);
+	}
+	/**
+	 * 用递归的方式实现对二叉树的后遍历
+	 * 
+	 * @param root
+	 * @return
+	 */
+	public static <T> List<T> postOrderVisit(BinaryTreeNode<T> root) {
+		List<T> result = new ArrayList<T>();
+		postOrderNode(root,result);
+		return result;
+	}
+	
+	private static <T> void postOrderNode(BinaryTreeNode<T> node,List<T> list){
+		if(null == node){
+			return;
+		}
+		
+		BinaryTreeNode<T> leftNode = node.getLeft();
+		postOrderNode(leftNode,list);
+		
+		BinaryTreeNode<T> rightNode = node.getRight();
+		postOrderNode(rightNode,list);
+		
+		T data = node.getData();
+		if(null != data){
+			list.add(data);
+		}
+		
+	}
+	/**
+	 * 用非递归的方式实现对二叉树的前序遍历
+	 * @param root
+	 * @return
+	 */
+	public static <T> List<T> preOrderWithoutRecursion(BinaryTreeNode<T> root) {
+		
+		List<T> result = new ArrayList<T>();
+		Stack stack = new Stack();
+		stack.push(root);
+		while(!stack.isEmpty()){
+			BinaryTreeNode<T> node = (BinaryTreeNode<T>) stack.pop();
+			if(null == node){
+				break;
+			}
+			T data = node.getData();
+			if(null != data){
+				result.add(data);
+			}
+				
+			BinaryTreeNode<T> rightNode = node.getRight();
+			if(null != rightNode){
+				stack.push(rightNode);
+			}
+			BinaryTreeNode<T> leftNode = node.getLeft();
+			if(null != leftNode){
+				stack.push(leftNode);
+			}
+		}
+		
+		return result;
+	}
+	/**
+	 * 用非递归的方式实现对二叉树的中序遍历
+	 * @param root
+	 * @return
+	 */
+	public static <T> List<T> inOrderWithoutRecursion(BinaryTreeNode<T> root) {
+		
+		List<T> result = new ArrayList<T>();
+		Stack nodeStack = new Stack();
+		Stack midStack = new Stack();
+		nodeStack.push(root);
+		while(!nodeStack.isEmpty()){
+			BinaryTreeNode<T> node = (BinaryTreeNode<T>) nodeStack.pop();
+			if(null == node){
+				break;
+			}
+			
+			BinaryTreeNode<T> rightNode = node.getRight();
+			if(null != rightNode){
+				nodeStack.push(rightNode);
+			}
+			
+			BinaryTreeNode<T> leftNode = node.getLeft();
+			if(null != leftNode){
+				midStack.push(node.getData());
+				nodeStack.push(leftNode);
+			}else{
+				T data = node.getData();
+				if(null != data){
+					result.add(data);
+				}
+				if(!midStack.isEmpty()){
+					result.add((T) midStack.pop());
+				}
+			}
+		} 
+		return result;
+	}
+	
+}
diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeUtilTest.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeUtilTest.java
new file mode 100644
index 0000000000..bee37c03a9
--- /dev/null
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/BinaryTreeUtilTest.java
@@ -0,0 +1,75 @@
+package com.github.ipk2015.coding2017.basic.tree;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+
+public class BinaryTreeUtilTest {
+
+	BinaryTreeNode<Integer> root = null;
+	@Before
+	public void setUp() throws Exception {
+		root = new BinaryTreeNode<Integer>(1);
+		root.setLeft(new BinaryTreeNode<Integer>(2));
+		root.setRight(new BinaryTreeNode<Integer>(5));
+		root.getLeft().setLeft(new BinaryTreeNode<Integer>(3));
+		root.getLeft().setRight(new BinaryTreeNode<Integer>(4));
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	@Test
+	public void testPreOrderVisit() {
+		
+		List<Integer> result = BinaryTreeUtil.preOrderVisit(root);
+		Assert.assertEquals("[1, 2, 3, 4, 5]", result.toString());
+		
+		
+	}
+	@Test
+	public void testInOrderVisit() {
+		
+		
+		List<Integer> result = BinaryTreeUtil.inOrderVisit(root);
+		Assert.assertEquals("[3, 2, 4, 1, 5]", result.toString());		
+		
+	}
+	
+	@Test
+	public void testPostOrderVisit() {
+		
+		
+		List<Integer> result = BinaryTreeUtil.postOrderVisit(root);
+		Assert.assertEquals("[3, 4, 2, 5, 1]", result.toString());		
+		
+	}
+	
+	
+	@Test
+	public void testInOrderVisitWithoutRecursion() {
+		BinaryTreeNode<Integer> node = root.getLeft().getRight();
+		node.setLeft(new BinaryTreeNode<Integer>(6));
+		node.setRight(new BinaryTreeNode<Integer>(7));
+		
+		List<Integer> result = BinaryTreeUtil.inOrderWithoutRecursion(root);
+		Assert.assertEquals("[3, 2, 6, 4, 7, 1, 5]", result.toString());		
+		
+	}
+	@Test
+	public void testPreOrderVisitWithoutRecursion() {
+		BinaryTreeNode<Integer> node = root.getLeft().getRight();
+		node.setLeft(new BinaryTreeNode<Integer>(6));
+		node.setRight(new BinaryTreeNode<Integer>(7));
+		
+		List<Integer> result = BinaryTreeUtil.preOrderWithoutRecursion(root);
+		Assert.assertEquals("[1, 2, 3, 4, 6, 7, 5]", result.toString());		
+		
+	}
+}
diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/FileList.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/FileList.java
new file mode 100644
index 0000000000..93c80da541
--- /dev/null
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/FileList.java
@@ -0,0 +1,30 @@
+package com.github.ipk2015.coding2017.basic.tree;
+
+
+
+import java.io.File;
+/*
+ * 给定一个目录，递归的列出下面所有的子目录和文件
+ * */
+public class FileList {
+	private static String stringSpace = "  ";
+	public static void list(File f) {
+		listOneFile(f,0);
+	}
+	
+	private static void listOneFile(File f,int space){
+		if(f.exists()){
+			File[] listFiles = f.listFiles();
+			for(int i = 0;i<listFiles.length;i++){
+				for(int j = 0;j<space;j++){
+					System.out.print(stringSpace);
+				}
+				System.out.println(listFiles[i].getName());
+				if(listFiles[i].isDirectory()){
+					listOneFile(listFiles[i],space+1);
+				}
+			}
+		}
+	}
+	
+}
diff --git a/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/FileListTest.java b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/FileListTest.java
new file mode 100644
index 0000000000..ffc4d81054
--- /dev/null
+++ b/group24/121111914/src/com/github/ipk2015/coding2017/basic/tree/FileListTest.java
@@ -0,0 +1,30 @@
+package com.github.ipk2015.coding2017.basic.tree;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FileListTest {
+
+	@Before
+	public void setUp() throws Exception {
+		
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	@Test
+	public void testList() {
+		String filePath = "E:\\javaImprove\\git\\group24\\121111914\\src\\com\\github\\ipk2015\\coding2017\\basic";
+		File f = new File(filePath);
+		FileList.list(f);
+		assertEquals(1, 1);
+	}
+
+}