Change directory structure to make it 'go get'able

I had some time so I rearranged your project directory structure so that it's 'go get'able.
I hope this helps you get a better understanding of what structure 'go get' expects.