rename some file and make some function clear