reorganize sources
reorganize sources
Merge pull request #2 from gev/master

reorganize sources