Re-structure
Merge branch 'master' of github.com:ClameZhang/iDong