Merge pull request #1 from bqluan/master

pull
import organize
Merge pull request #1 from Long-Jason/master

re-organized architecture