issue #3451. move directory structure
Merge pull request #37 from andyque/master

issue #3451. move directory structure