cut to dirs
merge confix Makefile
small edit
Merge branch 'dev' of github.com:pythonwood/tencent-internship into dev