Fix some typos; rearrange some files
Merge branch 'master' of https://github.com/xsited/nfv