resturcture file system, fixed some bug.