Merge pull request #1 from anowak/new-layout

More idiomatic source layout
Merge https://github.com/Shippable/sample_go