Restructured folders
Merge pull request #56 from xue0chao/master

Restructured folders