Updated layout correctly for adding to GOPATH.