fix bugs and modify some file name.