rename files, fix unit tests
Merge branch 'master' of https://github.com/hongbiao/cutting-edge