change structure

change structure
Merge branch 'dev'