restructure the model
Merge branch 'master' of github.com:virgilerin/minzhang