rearranged source tree
Merge pull request #791 from houqp/new_ui_houqp

rearrange source tree