source structure changes
Merge pull request #15 from frikille/master

source structure changes