update directory hierarchy.
Merge branch 'master' of https://github.com/consen/demo