Changed structure
Merge pull request #16 from jameshomunhoe/master

Changed structure