re-organized the gopath code.