Rearrange src files
Merge pull request #4 from ccgn/master

Rearrange src files