add gitignore
update file structure
Merge branch 'master' into zhangpeng