Correcting project structure according to http://golang.org/doc/code.html
Merging