restructure
Merge branch 'restructure'
user schema bug fixed