change module layout
Merge branch 'modulize'