Refactored GOPATH