Moved things around to better handle gopath stuff