reorganize files
Merge pull request #11 from satra/master

reorganizing file structure